Author: bpapez
Date: Tue Nov 13 11:56:33 2007
New Revision: 19131
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19131&repname=
=3Djahia
Log:
Remove orderByRanking from db_get_all_containers_id
Modified:
branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/containers/Contai=
nerFactory.java
branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/containers/JahiaC=
ontainerUtilsDB.java
branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/containers/JahiaC=
ontainersBaseService.java
branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/containers/JahiaC=
ontainersService.java
Modified: branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/containers/=
ContainerFactory.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-4-1-BR=
ANCH/src/java/org/jahia/services/containers/ContainerFactory.java&rev=3D191=
31&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/containers/Contai=
nerFactory.java (original)
+++ branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/containers/Contai=
nerFactory.java Tue Nov 13 11:56:33 2007
@@ -460,7 +460,7 @@
.getctnidsInList (clist.getID(), loadVersi=
on);
} else {
return ServicesRegistry.getInstance ()
- .getJahiaContainersService ().getCtnIds (t=
rue, resultBitSet, loadVersion);
+ .getJahiaContainersService ().getCtnIds (r=
esultBitSet, loadVersion);
}
}
catch (Throwable t) {
Modified: branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/containers/=
JahiaContainerUtilsDB.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-4-1-BR=
ANCH/src/java/org/jahia/services/containers/JahiaContainerUtilsDB.java&rev=
=3D19131&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/containers/JahiaC=
ontainerUtilsDB.java (original)
+++ branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/containers/JahiaC=
ontainerUtilsDB.java Tue Nov 13 11:56:33 2007
@@ -1730,7 +1730,7 @@
* @return
* @throws JahiaException
*/
- public Vector db_get_all_containers_id (boolean orderByRanking, BitSet=
ids, EntryLoadRequest loadVersion)
+ public Vector db_get_all_containers_id (BitSet ids, EntryLoadRequest l=
oadVersion)
throws JahiaException {
=
if (ids =3D=3D null || ids.length()=3D=3D0){
@@ -1756,124 +1756,93 @@
dbConn =3D ConnectionDispenser.getConnection();
result =3D new Vector();
StringBuffer queryBuffer =3D null;
- if ( !orderByRanking ){
- // Get all containers IDs.
- if (loadVersion =3D=3D null || loadVersion.isVersioned() &=
& compareMode) {
- queryBuffer =3D new StringBuffer("SELECT DISTINCT id_j=
ahia_ctn_entries FROM jahia_ctn_entries ");
- queryBuffer.append(JahiaTools.getWhereClausesFromBitSe=
t(dbMaxElementsForInClause,ids,
- "id_jahia_ctn_entries","=3D","OR",true,false,"=
"));
- stmt =3D dbConn.prepareStatement(queryBuffer.toString(=
));
- } else if (loadVersion.isStaging()) {
- queryBuffer =3D new StringBuffer("SELECT DISTINCT id_j=
ahia_ctn_entries FROM jahia_ctn_entries ");
- queryBuffer.append(JahiaTools.getWhereClausesFromBitSe=
t(dbMaxElementsForInClause,ids,
- "id_jahia_ctn_entries","=3D","OR",true,true," =
AND "));
- queryBuffer.append(" workflow_state>=3D1 ");
- if ( !loadVersion.isWithMarkedForDeletion() ){
- queryBuffer.append(" AND version_id !=3D -1 ");
+ // Get all containers IDs.
+ if (loadVersion =3D=3D null || loadVersion.isVersioned() && co=
mpareMode) {
+ queryBuffer =3D new StringBuffer(
+ "SELECT id_jahia_ctn_entries, rank_jahia_ctn_entri=
es FROM jahia_ctn_entries ");
+ queryBuffer.append(JahiaTools.getWhereClausesFromBitSet(
+ dbMaxElementsForInClause, ids, "id_jahia_ctn_entri=
es",
+ "=3D", "OR", true, false, ""));
+ queryBuffer.append(" ORDER BY rank_jahia_ctn_entries");
+ stmt =3D dbConn.prepareStatement(queryBuffer.toString());
+ } else if (loadVersion.isStaging()) {
+ queryBuffer =3D new StringBuffer(
+ "SELECT id_jahia_ctn_entries, version_id, rank_jah=
ia_ctn_entries, workflow_state FROM jahia_ctn_entries ");
+ queryBuffer.append(JahiaTools.getWhereClausesFromBitSet(
+ dbMaxElementsForInClause, ids, "id_jahia_ctn_entri=
es",
+ "=3D", "OR", true, true, " AND "));
+ queryBuffer
+ .append(" workflow_state>=3D1 ORDER BY id_jahia_ct=
n_entries, workflow_state DESC");
+ stmt =3D dbConn.prepareStatement(queryBuffer.toString());
+ } else if (loadVersion.isVersioned() && !compareMode) {
+ queryBuffer =3D new StringBuffer(
+ "SELECT id_jahia_ctn_entries, version_id, rank_jah=
ia_ctn_entries FROM jahia_ctn_entries ");
+ queryBuffer.append(JahiaTools.getWhereClausesFromBitSet(
+ dbMaxElementsForInClause, ids, "id_jahia_ctn_entri=
es",
+ "=3D", "OR", true, true, " AND "));
+ queryBuffer
+ .append(" workflow_state<=3D1 AND version_id<=3D? =
ORDER BY id_jahia_ctn_entries, version_id DESC");
+ stmt.setInt(1, loadVersion.getVersionID());
+ stmt =3D dbConn.prepareStatement(queryBuffer.toString());
+ } else {
+ queryBuffer =3D new StringBuffer(
+ "SELECT id_jahia_ctn_entries, rank_jahia_ctn_entri=
es FROM jahia_ctn_entries ");
+ queryBuffer.append(JahiaTools.getWhereClausesFromBitSet(
+ dbMaxElementsForInClause, ids, "id_jahia_ctn_entri=
es",
+ "=3D", "OR", true, true, " AND "));
+ queryBuffer
+ .append(" workflow_state=3D1 ORDER BY rank_jahia_c=
tn_entries, id_jahia_ctn_entries");
+ stmt =3D dbConn.prepareStatement(queryBuffer.toString());
+ }
+ rs =3D stmt.executeQuery();
+ if (loadVersion !=3D null
+ && (loadVersion.isStaging() || (loadVersion.isVersione=
d() && !compareMode))) {
+ Set addedCtnIds =3D new HashSet();
+ List sortedRanks =3D new ArrayList();
+ Integer previousCtnID =3D new Integer(-2);
+ Integer ctnID =3D null;
+ int id =3D 0;
+ while (rs.next()) {
+ id =3D rs.getInt(1);
+ if (applyBitsetCheck && !ids.get(id)) {
+ continue;
}
- stmt =3D dbConn.prepareStatement(queryBuffer.toString(=
));
- } else if (loadVersion.isVersioned() && !compareMode) {
- queryBuffer =3D new StringBuffer("SELECT DISTINCT id_j=
ahia_ctn_entries FROM jahia_ctn_entries ");
- queryBuffer.append(JahiaTools.getWhereClausesFromBitSe=
t(dbMaxElementsForInClause,ids,
- "id_jahia_ctn_entries","=3D","OR",true,true," =
AND "));
- queryBuffer.append(" workflow_state<=3D1 AND version_i=
d<=3D?");
- stmt =3D dbConn.prepareStatement(queryBuffer.toString(=
));
- stmt.setInt(1, loadVersion.getVersionID());
- } else {
- queryBuffer =3D new StringBuffer("SELECT DISTINCT id_j=
ahia_ctn_entries FROM jahia_ctn_entries ");
- queryBuffer.append(JahiaTools.getWhereClausesFromBitSe=
t(dbMaxElementsForInClause,ids,
- "id_jahia_ctn_entries","=3D","OR",true,true," =
AND "));
- queryBuffer.append(" workflow_state=3D1");
- stmt =3D dbConn.prepareStatement(queryBuffer.toString(=
));
- }
- rs =3D stmt.executeQuery();
- if ( applyBitsetCheck ){
- int nb_to_insert;
- while (rs.next()) {
- nb_to_insert =3D rs.getInt (1);
- if (ids.get(nb_to_insert)) {
- result.add (new Integer (nb_to_insert));
+ ctnID =3D new Integer(id);
+ if (!addedCtnIds.contains(ctnID)
+ && !previousCtnID.equals(ctnID)
+ && (loadVersion.isWithMarkedForDeletion() || rs
+ .getLong(2) !=3D -1)) {
+ int rank =3D rs.getInt(3);
+ if (rank !=3D 0) {
+ int index =3D 0;
+ int size =3D sortedRanks.size();
+ while (index < size
+ && ((Integer) sortedRanks.get(index))
+ .intValue() < rank) {
+ index++;
+ }
+
+ sortedRanks.add(index, new Integer(rank));
+ result.add(index, ctnID);
+ } else {
+ result.add(ctnID);
}
+ addedCtnIds.add(ctnID);
}
- } else {
- while (rs.next()) {
- result.add (new Integer (rs.getInt (1)));
- }
+ previousCtnID =3D ctnID;
}
} else {
-
- // Get all containers IDs.
- if (loadVersion =3D=3D null || loadVersion.isVersioned() &=
& compareMode) {
- queryBuffer =3D new StringBuffer("SELECT id_jahia_ctn_=
entries, rank_jahia_ctn_entries FROM jahia_ctn_entries ");
- queryBuffer.append(JahiaTools.getWhereClausesFromBitSe=
t(dbMaxElementsForInClause,ids,
- "id_jahia_ctn_entries","=3D","OR",true,false,"=
"));
- queryBuffer.append(" ORDER BY rank_jahia_ctn_entries");
- stmt =3D dbConn.prepareStatement(queryBuffer.toString(=
));
- } else if (loadVersion.isStaging()) {
- queryBuffer =3D new StringBuffer("SELECT id_jahia_ctn_=
entries, version_id, rank_jahia_ctn_entries, workflow_state FROM jahia_ctn_=
entries ");
- queryBuffer.append(JahiaTools.getWhereClausesFromBitSe=
t(dbMaxElementsForInClause,ids,
- "id_jahia_ctn_entries","=3D","OR",true,true," =
AND "));
- queryBuffer.append(" workflow_state>=3D1 ORDER BY id_j=
ahia_ctn_entries, workflow_state DESC");
- stmt =3D dbConn.prepareStatement(queryBuffer.toString(=
));
- } else if (loadVersion.isVersioned() && !compareMode) {
- queryBuffer =3D new StringBuffer("SELECT id_jahia_ctn_=
entries, version_id, rank_jahia_ctn_entries FROM jahia_ctn_entries ");
- queryBuffer.append(JahiaTools.getWhereClausesFromBitSe=
t(dbMaxElementsForInClause,ids,
- "id_jahia_ctn_entries","=3D","OR",true,true," =
AND "));
- queryBuffer.append(" workflow_state<=3D1 AND version_i=
d<=3D? ORDER BY id_jahia_ctn_entries, version_id DESC");
- stmt.setInt(1, loadVersion.getVersionID());
- stmt =3D dbConn.prepareStatement(queryBuffer.toString(=
));
- } else {
- queryBuffer =3D new StringBuffer("SELECT id_jahia_ctn_=
entries, rank_jahia_ctn_entries FROM jahia_ctn_entries ");
- queryBuffer.append(JahiaTools.getWhereClausesFromBitSe=
t(dbMaxElementsForInClause,ids,
- "id_jahia_ctn_entries","=3D","OR",true,true," =
AND "));
- queryBuffer.append(" workflow_state=3D1 ORDER BY rank_=
jahia_ctn_entries, id_jahia_ctn_entries");
- stmt =3D dbConn.prepareStatement(queryBuffer.toString(=
));
- }
- rs =3D stmt.executeQuery();
- if (loadVersion !=3D null && (loadVersion.isStaging() || (=
loadVersion.isVersioned() && !compareMode))) {
- Set addedCtnIds =3D new HashSet();
- List sortedRanks =3D new ArrayList();
- Integer previousCtnID =3D new Integer(-2);
- Integer ctnID =3D null;
- int id =3D 0;
+ if (applyBitsetCheck) {
+ int nb_to_insert;
while (rs.next()) {
- id =3D rs.getInt(1);
- if ( applyBitsetCheck && !ids.get(id) ){
- continue;
- }
- ctnID =3D new Integer(id);
- if (!addedCtnIds.contains(ctnID) && !previousCtnID=
.equals(ctnID)
- && (loadVersion.isWithMarkedForDeletion() =
|| rs.getLong(2) !=3D -1)) {
- int rank =3D rs.getInt(3);
- if (rank !=3D 0) {
- int index =3D 0;
- int size =3D sortedRanks.size();
- while (index < size && ((Integer) sortedRa=
nks.get(index)).intValue() < rank) {
- index++;
- }
-
- sortedRanks.add(index, new Integer(rank));
- result.add(index, ctnID);
- } else {
- result.add(ctnID);
- }
- addedCtnIds.add(ctnID);
+ nb_to_insert =3D rs.getInt(1);
+ if (ids.get(nb_to_insert)) {
+ result.add(new Integer(nb_to_insert));
}
- previousCtnID =3D ctnID;
}
} else {
- if ( applyBitsetCheck ){
- int nb_to_insert;
- while (rs.next()) {
- nb_to_insert =3D rs.getInt (1);
- if (ids.get(nb_to_insert)) {
- result.add (new Integer (nb_to_insert));
- }
- }
- } else {
- while (rs.next()) {
- result.add (new Integer (rs.getInt (1)));
- }
+ while (rs.next()) {
+ result.add(new Integer(rs.getInt(1)));
}
}
}
Modified: branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/containers/=
JahiaContainersBaseService.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-4-1-BR=
ANCH/src/java/org/jahia/services/containers/JahiaContainersBaseService.java=
&rev=3D19131&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/containers/JahiaC=
ontainersBaseService.java (original)
+++ branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/containers/JahiaC=
ontainersBaseService.java Tue Nov 13 11:56:33 2007
@@ -651,8 +651,8 @@
* =
* @see org.jahia.services.containers.JahiaContainersService#getCtnIds(=
boolean, java.util.BitSet)
*/
- public Vector getCtnIds(boolean orderByRanking, BitSet ids, EntryLoadRe=
quest loadRequest) throws JahiaException {
- return c_utils.db_get_all_containers_id(orderByRanking, ids, loadRe=
quest);
+ public Vector getCtnIds(BitSet ids, EntryLoadRequest loadRequest) throw=
s JahiaException {
+ return c_utils.db_get_all_containers_id(ids, loadRequest);
}
=
/**
Modified: branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/containers/=
JahiaContainersService.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-4-1-BR=
ANCH/src/java/org/jahia/services/containers/JahiaContainersService.java&rev=
=3D19131&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/containers/JahiaC=
ontainersService.java (original)
+++ branches/JAHIA-4-1-BRANCH/src/java/org/jahia/services/containers/JahiaC=
ontainersService.java Tue Nov 13 11:56:33 2007
@@ -225,13 +225,12 @@
/**
* Correct version to sort a containerList without any sort defined
*
- * @param orderByRanking if true, order by container ranking
* @param ids
* @param loadRequest
* @return
* @throws JahiaException
*/
- public abstract Vector getCtnIds(boolean orderByRanking, BitSet ids, En=
tryLoadRequest loadRequest)
+ public abstract Vector getCtnIds(BitSet ids, EntryLoadRequest loadReque=
st)
throws JahiaException;
=
/**
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
