Diff of /xoonips/AL/commonal.cc

OSDN > Find Software > XooNIps

 Browse CVS Repository



/[OSDN]/xoonips/AL/commonal.cc




Diff of /xoonips/AL/commonal.cc



 Parent Directory

|  Revision Log


|  Revision Graph


|  Patch














revision 1.42 by aga,
Wed Jan 19 00:51:29 2005 UTC




revision 1.43 by aga,
Wed Jan 19 01:42:15 2005 UTC






#

Line 2 



Line 2 













2
  * 
  * 

















3
  * $Revision$
  * $Revision$

















4
  * $Log$
  * $Log$












5
 
  * Revision 1.43  2005/01/19 01:42:15  aga







6
 
  * ・x_xnpaccount_indexのgid,uidが0にならないよう修正.







7
 
  *












8
  * Revision 1.42  2005/01/19 00:51:29  aga
  * Revision 1.42  2005/01/19 00:51:29  aga

















9
  * ・insertIndexでx_xnpaccount_index.index_idがおかしいのを修正.
  * ・insertIndexでx_xnpaccount_index.index_idがおかしいのを修正.

















10
  *
  *











#

Line 3656 
 static result_t getIndexesInternal( sess


Line 3659 
 static result_t getIndexesInternal( sess












3659
                 if ( lens[ 9] == SQL_NULL_DATA ) title[0] = '\0';
                 if ( lens[ 9] == SQL_NULL_DATA ) title[0] = '\0';

















3660
                 if ( lens[10] == SQL_NULL_DATA ) keywords[0] = '\0';
                 if ( lens[10] == SQL_NULL_DATA ) keywords[0] = '\0';

















3661
                 if ( lens[11] == SQL_NULL_DATA ) description[0] = '\0';
                 if ( lens[11] == SQL_NULL_DATA ) description[0] = '\0';












3662
 
                 if ( lens[ 2] == SQL_NULL_DATA ) ownerUID = 0;







3663
 
                 if ( lens[ 3] == SQL_NULL_DATA ) ownerGID = 0;












3664
                 index[i].setIndexID( xid );
                 index[i].setIndexID( xid );

















3665
                 index[i].setParentIndexID( parentXID );
                 index[i].setParentIndexID( parentXID );

















3666
                 index[i].setOwnerUID( ownerUID );
                 index[i].setOwnerUID( ownerUID );











#

Line 3982 
 static result_t insertIndexInternal( ses


Line 3987 
 static result_t insertIndexInternal( ses












3987
 
 

















3988
     result_t result = insertItem( sid, index, &iid );
     result_t result = insertItem( sid, index, &iid );

















3989
     if ( result == RES_OK ){
     if ( result == RES_OK ){












3990
 
         string nullString("NULL");












3991
         string sql = "INSERT INTO " + dbprefix + "_xnpaccount_index ( index_id, parent_index_id, uid, gid, open_level, sort_number ) values ( "
         string sql = "INSERT INTO " + dbprefix + "_xnpaccount_index ( index_id, parent_index_id, uid, gid, open_level, sort_number ) values ( "

















3992
          + unsignedIntToString(iid) + ","
          + unsignedIntToString(iid) + ","















3993


          + unsignedIntToString(index->getParentIndexID()) + "," + unsignedIntToString(index->getOwnerUID()) + "," 


          + unsignedIntToString(index->getParentIndexID()) + "," 













3994


          + unsignedIntToString(index->getOwnerGID())  + "," + unsignedIntToString(index->getOpenLevel()) + "," 


          + ( index->getOpenLevel() == index::OL_PRIVATE    ? unsignedIntToString(index->getOwnerUID()) : nullString ) + "," 













3995


 


          + ( index->getOpenLevel() == index::OL_GROUP_ONLY ? unsignedIntToString(index->getOwnerGID()) : nullString ) + "," 













3996


 


          + unsignedIntToString(index->getOpenLevel()) + "," 















3997
          + unsignedIntToString(index->getSortNumber()) + ") ";
          + unsignedIntToString(index->getSortNumber()) + ") ";

















3998
         result = querySimple( "insertIndexInternal", sql );
         result = querySimple( "insertIndexInternal", sql );

















3999
         if( result == RES_OK ){
         if( result == RES_OK ){











#

Line 4407 
 result_t updateIndexInternal( sessionid_


Line 4415 
 result_t updateIndexInternal( sessionid_












4415
     
     

















4416
     
     

















4417
     
     












4418
 
     string ownerOpenLevelString = unsignedIntToString( newParentIndex->getOpenLevel() );







4419
 
     string ownerUIDString = ( newParentIndex->getOpenLevel() == index::OL_PRIVATE    ? unsignedIntToString(newParentIndex->getOwnerUID()) : "NULL" );







4420
 
     string ownerGIDString = ( newParentIndex->getOpenLevel() == index::OL_GROUP_ONLY ? unsignedIntToString(newParentIndex->getOwnerGID()) : "NULL" );












4421
     SQLRETURN sqlcode;
     SQLRETURN sqlcode;















4422


     SQLHANDLE hstmt = NULL;    


     SQLHANDLE hstmt = NULL;















4423
     if( ( sqlcode = SQLAllocHandle( SQL_HANDLE_STMT, hdbc, &hstmt ) ) == SQL_SUCCESS ) {
     if( ( sqlcode = SQLAllocHandle( SQL_HANDLE_STMT, hdbc, &hstmt ) ) == SQL_SUCCESS ) {














         string ownerUIDString = "0";
 










         string ownerGIDString = "0";
 










         if ( newIndex->getOwnerUID() != 0 ) ownerUIDString = unsignedIntToString(newIndex->getOwnerUID());
 










         if ( newIndex->getOwnerGID() != 0 ) ownerGIDString = unsignedIntToString(newIndex->getOwnerGID());
 













4424
         string sql("UPDATE " +  dbprefix + "_xnpaccount_index set"
         string sql("UPDATE " +  dbprefix + "_xnpaccount_index set"

















4425
             " parent_index_id = " + unsignedIntToString(newIndex->getParentIndexID()) + 
             " parent_index_id = " + unsignedIntToString(newIndex->getParentIndexID()) + 

















4426
             ", uid = " + ownerUIDString + 
             ", uid = " + ownerUIDString + 

















4427
             ", gid = " + ownerGIDString + 
             ", gid = " + ownerGIDString + 















4428


             ", open_level = " + unsignedIntToString(newIndex->getOpenLevel()) + 


             ", open_level = " + ownerOpenLevelString + 















4429
             ", sort_number = " + unsignedIntToString(newIndex->getSortNumber()) +
             ", sort_number = " + unsignedIntToString(newIndex->getSortNumber()) +

















4430
             " where index_id = " + unsignedIntToString(newIndex->getIndexID()) );
             " where index_id = " + unsignedIntToString(newIndex->getIndexID()) );

















4431
         
         











#

Line 4484 
 result_t updateIndexInternal( sessionid_


Line 4491 
 result_t updateIndexInternal( sessionid_












4491
             int i;
             int i;

















4492
             for ( i = 0; i < descXIDLen; i++ ){
             for ( i = 0; i < descXIDLen; i++ ){

















4493
                 string sql = "UPDATE " + dbprefix + "_xnpaccount_index set "
                 string sql = "UPDATE " + dbprefix + "_xnpaccount_index set "















4494


                   " uid=" + unsignedIntToString(newParentIndex->getOwnerUID()) +


                   " uid=" + ownerUIDString +













4495


                   ", gid=" + unsignedIntToString(newParentIndex->getOwnerGID()) +


                   ", gid=" + ownerGIDString +













4496


                   ", open_level=" + unsignedIntToString(newParentIndex->getOpenLevel()) +


                   ", open_level=" + ownerOpenLevelString +















4497
                   " WHERE index_id=" + unsignedIntToString(descXID[i]);
                   " WHERE index_id=" + unsignedIntToString(descXID[i]);

















4498
                 querySimple( "updateIndex", sql );
                 querySimple( "updateIndex", sql );

















4499
             }
             }





























Legend:



Removed from v.1.42
 


changed lines


 
Added in v.1.43













Back to OSDN">Back to OSDN
ViewVC Help


Powered by ViewVC 1.1.26
 /[OSDN]/xoonips/AL/commonal.cc
-revision 1.42 by aga,
Wed Jan 19 00:51:29 2005 UTC
+revision 1.43 by aga,
Wed Jan 19 01:42:15 2005 UTC
 Line 2
   *
   * $Revision$
   * $Log$
+  * Revision 1.43  2005/01/19 01:42:15  aga
+  * ・x_xnpaccount_indexのgid,uidが0にならないよう修正.
+  *
   * Revision 1.42  2005/01/19 00:51:29  aga
   * ・insertIndexでx_xnpaccount_index.index_idがおかしいのを修正.
   *
-Line 3656 
 static result_t getIndexesInternal( sess
+Line 3659 
 static result_t getIndexesInternal( sess
                  if ( lens[ 9] == SQL_NULL_DATA ) title[0] = '\0';
                  if ( lens[10] == SQL_NULL_DATA ) keywords[0] = '\0';
                  if ( lens[11] == SQL_NULL_DATA ) description[0] = '\0';
+                 if ( lens[ 2] == SQL_NULL_DATA ) ownerUID = 0;
+                 if ( lens[ 3] == SQL_NULL_DATA ) ownerGID = 0;
                  index[i].setIndexID( xid );
                  index[i].setParentIndexID( parentXID );
                  index[i].setOwnerUID( ownerUID );
-Line 3982 
 static result_t insertIndexInternal( ses
+Line 3987 
 static result_t insertIndexInternal( ses
      result_t result = insertItem( sid, index, &iid );
      if ( result == RES_OK ){
+         string nullString("NULL");
          string sql = "INSERT INTO " + dbprefix + "_xnpaccount_index ( index_id, parent_index_id, uid, gid, open_level, sort_number ) values ( "
           + unsignedIntToString(iid) + ","
-          + unsignedIntToString(index->getParentIndexID()) + "," + unsignedIntToString(index->getOwnerUID()) + ","
+          + unsignedIntToString(index->getParentIndexID()) + ","
-          + unsignedIntToString(index->getOwnerGID())  + "," + unsignedIntToString(index->getOpenLevel()) + ","
+          + ( index->getOpenLevel() == index::OL_PRIVATE    ? unsignedIntToString(index->getOwnerUID()) : nullString ) + ","
+          + ( index->getOpenLevel() == index::OL_GROUP_ONLY ? unsignedIntToString(index->getOwnerGID()) : nullString ) + ","
+          + unsignedIntToString(index->getOpenLevel()) + ","
           + unsignedIntToString(index->getSortNumber()) + ") ";
          result = querySimple( "insertIndexInternal", sql );
          if( result == RES_OK ){
-Line 4407 
 result_t updateIndexInternal( sessionid_
+Line 4415 
 result_t updateIndexInternal( sessionid_
+     string ownerOpenLevelString = unsignedIntToString( newParentIndex->getOpenLevel() );
+     string ownerUIDString = ( newParentIndex->getOpenLevel() == index::OL_PRIVATE    ? unsignedIntToString(newParentIndex->getOwnerUID()) : "NULL" );
+     string ownerGIDString = ( newParentIndex->getOpenLevel() == index::OL_GROUP_ONLY ? unsignedIntToString(newParentIndex->getOwnerGID()) : "NULL" );
      SQLRETURN sqlcode;
      SQLHANDLE hstmt = NULL;
      if( ( sqlcode = SQLAllocHandle( SQL_HANDLE_STMT, hdbc, &hstmt ) ) == SQL_SUCCESS ) {
-         string ownerUIDString = "0";
-         string ownerGIDString = "0";
-         if ( newIndex->getOwnerUID() != 0 ) ownerUIDString = unsignedIntToString(newIndex->getOwnerUID());
-         if ( newIndex->getOwnerGID() != 0 ) ownerGIDString = unsignedIntToString(newIndex->getOwnerGID());
          string sql("UPDATE " +  dbprefix + "_xnpaccount_index set"
              " parent_index_id = " + unsignedIntToString(newIndex->getParentIndexID()) +
              ", uid = " + ownerUIDString +
              ", gid = " + ownerGIDString +
-             ", open_level = " + unsignedIntToString(newIndex->getOpenLevel()) +
+             ", open_level = " + ownerOpenLevelString +
              ", sort_number = " + unsignedIntToString(newIndex->getSortNumber()) +
              " where index_id = " + unsignedIntToString(newIndex->getIndexID()) );
-Line 4484 
 result_t updateIndexInternal( sessionid_
+Line 4491 
 result_t updateIndexInternal( sessionid_
              int i;
              for ( i = 0; i < descXIDLen; i++ ){
                  string sql = "UPDATE " + dbprefix + "_xnpaccount_index set "
-                   " uid=" + unsignedIntToString(newParentIndex->getOwnerUID()) +
+                   " uid=" + ownerUIDString +
-                   ", gid=" + unsignedIntToString(newParentIndex->getOwnerGID()) +
+                   ", gid=" + ownerGIDString +
-                   ", open_level=" + unsignedIntToString(newParentIndex->getOpenLevel()) +
+                   ", open_level=" + ownerOpenLevelString +
                    " WHERE index_id=" + unsignedIntToString(descXID[i]);
                  querySimple( "updateIndex", sql );
              }
 Legend:



Removed from v.1.42
 


changed lines


 
Added in v.1.43
 Legend:



Removed from v.1.42
 


changed lines


 
Added in v.1.43
-Removed from v.1.42
+Added in v.1.43
-Back to OSDN">Back to OSDN
+ViewVC Help
 Powered by ViewVC 1.1.26

Develop and Download Open Source Software

XooNIps

Browse CVS Repository