Changeset 1588 for MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice/internal/Cache.java

Timestamp:

10/21/11 10:29:20 (13 years ago)

Author:

gaba

Message:

squery removing changes

File:

• MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice/internal/Cache.java (modified) (3 diffs)

MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice/internal/Cache.java

@@ -117 +117 @@
      *   query=""
      *   repository="localhost-mirror"
-     *   squery=""
      *   startItem=""
      *   type="collections"/>
@@ -156 +155 @@
                 }
                 if (key_array.length > 3){
-                        e.setAttribute("squery", key_array[3]);
-                }else{
-                        e.setAttribute("squery", "");
+                        e.setAttribute("startItem", key_array[3]);
+                }else{
+                        e.setAttribute("startItem", "");
                 }
                 if (key_array.length > 4){
-                        e.setAttribute("startItem", key_array[4]);
-                }else{
-                        e.setAttribute("startItem", "");
-                }
+                        e.setAttribute("maximumItems", key_array[4]);
+                }else{
+                        e.setAttribute("maximumItems", "");
+                }
+                
                 if (key_array.length > 5){
-                        e.setAttribute("maximumItems", key_array[5]);
-                }else{
-                        e.setAttribute("maximumItems", "");
-                }
-                
+                        e.setAttribute("repository", key_array[5]);
+                }else{
+                        e.setAttribute("repository", "");
+                }
                 if (key_array.length > 6){
-                        e.setAttribute("repository", key_array[6]);
-                }else{
-                        e.setAttribute("repository", "");
+                        e.setAttribute("maxDepth", key_array[6]);
+                }else{
+                        e.setAttribute("maxDepth", "");
                 }
                 if (key_array.length > 7){
-                        e.setAttribute("maxDepth", key_array[7]);
-                }else{
-                        e.setAttribute("maxDepth", "");
+                        e.setAttribute("lang", key_array[7]);
+                }else{
+                        e.setAttribute("lang", "");
                 }
                 if (key_array.length > 8){
-                        e.setAttribute("lang", key_array[8]);
-                }else{
-                        e.setAttribute("lang", "");
-                }
-                if (key_array.length > 9){
-                        e.setAttribute("duration", key_array[9]);
+                        e.setAttribute("duration", key_array[8]);
                 }else{
                         e.setAttribute("duration", "");
@@ -281 +275 @@
                 }
                 if (key_array.length > 3){
-                        xpath_expr = xpath_expr + "and @squery='"+key_array[3]+"'";
-                }else{
-                        xpath_expr = xpath_expr + " and @squery=''";
+                        xpath_expr = xpath_expr + "and @startItem='"+key_array[3]+"'";
+                }else{
+                        xpath_expr = xpath_expr + " and @startItem=''";
                 }
                 if (key_array.length > 4){
-                        xpath_expr = xpath_expr + "and @startItem='"+key_array[4]+"'";
-                }else{
-                        xpath_expr = xpath_expr + " and @startItem=''";
-                }
+                        xpath_expr = xpath_expr + "and @maximumItems='"+key_array[4]+"'";
+                }else{
+                        xpath_expr = xpath_expr + " and @maximumItems=''";
+                }
+                
                 if (key_array.length > 5){
-                        xpath_expr = xpath_expr + "and @maximumItems='"+key_array[5]+"'";
-                }else{
-                        xpath_expr = xpath_expr + " and @maximumItems=''";
-                }
-                
+                        xpath_expr = xpath_expr + "and @repository='"+key_array[5]+"'";
+                }else{
+                        xpath_expr = xpath_expr + " and @repository=''";
+                }
                 if (key_array.length > 6){
-                        xpath_expr = xpath_expr + "and @repository='"+key_array[6]+"'";
-                }else{
-                        xpath_expr = xpath_expr + " and @repository=''";
+                        xpath_expr = xpath_expr + "and @maxDepth='"+key_array[6]+"'";
+                }else{
+                        xpath_expr = xpath_expr + " and @maxDepth=''";
                 }
                 if (key_array.length > 7){
-                        xpath_expr = xpath_expr + "and @maxDepth='"+key_array[7]+"'";
-                }else{
-                        xpath_expr = xpath_expr + " and @maxDepth=''";
-                }
-                if (key_array.length > 8){
-                        xpath_expr = xpath_expr + "and @lang='"+key_array[8]+"']";
+                        xpath_expr = xpath_expr + "and @lang='"+key_array[7]+"']";
                 }else{
                         xpath_expr = xpath_expr + " and @lang='']";