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.84 by tani,
Mon Mar 14 06:12:11 2005 UTC




revision 1.85 by aga4096,
Mon Mar 14 09:30:50 2005 UTC






#

Line 2 



Line 2 













2
  * 
  * 

















3
  * $Revision$
  * $Revision$

















4
  * $Log$
  * $Log$












5
 
  * Revision 1.85  2005/03/14 09:30:50  aga4096







6
 
  * ・getItemCountByIndexで、作成者・グループ管理者は未承認アイテムをカウントするよう修正.







7
 
  *












8
  * Revision 1.84  2005/03/14 06:12:11  tani
  * Revision 1.84  2005/03/14 06:12:11  tani

















9
  * __BORLANDC__対応.
  * __BORLANDC__対応.

















10
  *
  *











#

Line 7094 
 result_t getItemCountGroupByIndex( sessi


Line 7097 
 result_t getItemCountGroupByIndex( sessi












7097
             " GROUP BY index_id";
             " GROUP BY index_id";

















7098
     }
     }

















7099
     else {
     else {












7100
 
        string uidString = unsignedIntToString( uid );












7101
        string certified = " tl.certify_state=" + unsignedIntToString( index::CERTIFIED );
        string certified = " tl.certify_state=" + unsignedIntToString( index::CERTIFIED );

















7102
        sql = "SELECT  tx.index_id, COUNT(tl.index_id) "
        sql = "SELECT  tx.index_id, COUNT(tl.index_id) "

















7103
             "  FROM " + indexTable + " AS tx"
             "  FROM " + indexTable + " AS tx"















7104


             "  LEFT JOIN " + groupsUsersLinkTable + " AS tgl ON tx.gid=tgl.gid AND tgl.uid=" + unsignedIntToString(uid) +


             "  LEFT JOIN " + groupsUsersLinkTable + " AS tgl ON tx.gid=tgl.gid AND tgl.uid=" + uidString +















7105
             "  LEFT JOIN " + indexItemLinkTable + " AS tl ON tx.index_id=tl.index_id "
             "  LEFT JOIN " + indexItemLinkTable + " AS tl ON tx.index_id=tl.index_id "

















7106
             "  LEFT JOIN " + itemTable + " AS ti ON ti.item_id=tl.item_id "
             "  LEFT JOIN " + itemTable + " AS ti ON ti.item_id=tl.item_id "

















7107
             "  WHERE "
             "  WHERE "















7108


             "   (tx.open_level=" + unsignedIntToString( index::OL_PUBLIC ) + " AND " + certified + 


             "   (tx.open_level=" + unsignedIntToString( index::OL_PUBLIC ) + " AND " +













7109


             " OR tx.open_level=" + unsignedIntToString( index::OL_GROUP_ONLY ) + " AND tgl.uid IS NOT NULL AND " + certified + 


                      "(" + certified + " OR ti.uid=" + uidString + " )" + 













7110


             " OR tx.open_level=" + unsignedIntToString( index::OL_PRIVATE ) + " AND tx.uid=" + unsignedIntToString(uid) +


             " OR tx.open_level=" + unsignedIntToString( index::OL_GROUP_ONLY ) + " AND tgl.uid IS NOT NULL AND " +













7111


 


                      "(" + certified + " OR ti.uid=" + uidString + " OR tgl.is_admin=1 )" + 













7112


 


             " OR tx.open_level=" + unsignedIntToString( index::OL_PRIVATE ) + " AND tx.uid=" + uidString +















7113
             "  ) AND ti.item_type_id <> " +  unsignedIntToString( item::ITID_INDEX ) +
             "  ) AND ti.item_type_id <> " +  unsignedIntToString( item::ITID_INDEX ) +

















7114
             "  GROUP BY tx.index_id";
             "  GROUP BY tx.index_id";

















7115
     }
     }





























Legend:



Removed from v.1.84
 


changed lines


 
Added in v.1.85













Back to OSDN">Back to OSDN
ViewVC Help


Powered by ViewVC 1.1.26
 /[OSDN]/xoonips/AL/commonal.cc
-revision 1.84 by tani,
Mon Mar 14 06:12:11 2005 UTC
+revision 1.85 by aga4096,
Mon Mar 14 09:30:50 2005 UTC
 Line 2
   *
   * $Revision$
   * $Log$
+  * Revision 1.85  2005/03/14 09:30:50  aga4096
+  * ・getItemCountByIndexで、作成者・グループ管理者は未承認アイテムをカウントするよう修正.
+  *
   * Revision 1.84  2005/03/14 06:12:11  tani
   * __BORLANDC__対応.
   *
-Line 7094 
 result_t getItemCountGroupByIndex( sessi
+Line 7097 
 result_t getItemCountGroupByIndex( sessi
              " GROUP BY index_id";
      }
      else {
+        string uidString = unsignedIntToString( uid );
         string certified = " tl.certify_state=" + unsignedIntToString( index::CERTIFIED );
         sql = "SELECT  tx.index_id, COUNT(tl.index_id) "
              "  FROM " + indexTable + " AS tx"
-             "  LEFT JOIN " + groupsUsersLinkTable + " AS tgl ON tx.gid=tgl.gid AND tgl.uid=" + unsignedIntToString(uid) +
+             "  LEFT JOIN " + groupsUsersLinkTable + " AS tgl ON tx.gid=tgl.gid AND tgl.uid=" + uidString +
              "  LEFT JOIN " + indexItemLinkTable + " AS tl ON tx.index_id=tl.index_id "
              "  LEFT JOIN " + itemTable + " AS ti ON ti.item_id=tl.item_id "
              "  WHERE "
-             "   (tx.open_level=" + unsignedIntToString( index::OL_PUBLIC ) + " AND " + certified +
+             "   (tx.open_level=" + unsignedIntToString( index::OL_PUBLIC ) + " AND " +
-             " OR tx.open_level=" + unsignedIntToString( index::OL_GROUP_ONLY ) + " AND tgl.uid IS NOT NULL AND " + certified +
+                      "(" + certified + " OR ti.uid=" + uidString + " )" +
-             " OR tx.open_level=" + unsignedIntToString( index::OL_PRIVATE ) + " AND tx.uid=" + unsignedIntToString(uid) +
+             " OR tx.open_level=" + unsignedIntToString( index::OL_GROUP_ONLY ) + " AND tgl.uid IS NOT NULL AND " +
+                      "(" + certified + " OR ti.uid=" + uidString + " OR tgl.is_admin=1 )" +
+             " OR tx.open_level=" + unsignedIntToString( index::OL_PRIVATE ) + " AND tx.uid=" + uidString +
              "  ) AND ti.item_type_id <> " +  unsignedIntToString( item::ITID_INDEX ) +
              "  GROUP BY tx.index_id";
      }
 Legend:



Removed from v.1.84
 


changed lines


 
Added in v.1.85
 Legend:



Removed from v.1.84
 


changed lines


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

Develop and Download Open Source Software

XooNIps

Browse CVS Repository