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

Timestamp:

04/04/12 08:38:32 (12 years ago)

Author:

gaba

Message:

cache changes

File:

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

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

@@ -150 +150 @@
                 }
                 if (key_array.length > 2){
-                        e.setAttribute("collection", key_array[2]);
+                        e.setAttribute("operation", key_array[2]);
+                }else{
+                        e.setAttribute("operation", "");
+                }
+                if (key_array.length > 3){
+                        e.setAttribute("collection", key_array[3]);
                 }else{
                         e.setAttribute("collection", "");
                 }
-                if (key_array.length > 3){
-                        e.setAttribute("startItem", key_array[3]);
+                if (key_array.length > 4){
+                        e.setAttribute("startItem", key_array[4]);
                 }else{
                         e.setAttribute("startItem", "");
                 }
-                if (key_array.length > 4){
-                        e.setAttribute("maximumItems", key_array[4]);
+                if (key_array.length > 5){
+                        e.setAttribute("maximumItems", key_array[5]);
                 }else{
                         e.setAttribute("maximumItems", "");
                 }
                 
-                if (key_array.length > 5){
-                        e.setAttribute("repository", key_array[5]);
+                if (key_array.length > 6){
+                        e.setAttribute("repository", key_array[6]);
                 }else{
                         e.setAttribute("repository", "");
                 }
-                if (key_array.length > 6){
-                        e.setAttribute("maxDepth", key_array[6]);
+                if (key_array.length > 7){
+                        e.setAttribute("maxDepth", key_array[7]);
                 }else{
                         e.setAttribute("maxDepth", "");
                 }
-                if (key_array.length > 7){
-                        e.setAttribute("lang", key_array[7]);
+                if (key_array.length > 8){
+                        e.setAttribute("lang", key_array[8]);
                 }else{
                         e.setAttribute("lang", "");
                 }
-                if (key_array.length > 8){
-                        e.setAttribute("duration", key_array[8]);
+                if (key_array.length > 9){
+                        e.setAttribute("duration", key_array[9]);
                 }else{
                         e.setAttribute("duration", "");
@@ -270 +275 @@
                 
                 if (key_array.length > 2){
-                        xpath_expr = xpath_expr + "and @collection='"+key_array[2]+"'";
+                        xpath_expr = xpath_expr + "and @operation='"+key_array[2]+"'";
+                }else{
+                        xpath_expr = xpath_expr + " and @operation=''";
+                }
+                
+                if (key_array.length > 3){
+                        xpath_expr = xpath_expr + "and @collection='"+key_array[3]+"'";
                 }else{
                         xpath_expr = xpath_expr + " and @collection=''";
                 }
-                if (key_array.length > 3){
-                        xpath_expr = xpath_expr + "and @startItem='"+key_array[3]+"'";
+                if (key_array.length > 4){
+                        xpath_expr = xpath_expr + "and @startItem='"+key_array[4]+"'";
                 }else{
                         xpath_expr = xpath_expr + " and @startItem=''";
                 }
-                if (key_array.length > 4){
-                        xpath_expr = xpath_expr + "and @maximumItems='"+key_array[4]+"'";
+                if (key_array.length > 5){
+                        xpath_expr = xpath_expr + "and @maximumItems='"+key_array[5]+"'";
                 }else{
                         xpath_expr = xpath_expr + " and @maximumItems=''";
                 }
                 
-                if (key_array.length > 5){
-                        xpath_expr = xpath_expr + "and @repository='"+key_array[5]+"'";
+                if (key_array.length > 6){
+                        xpath_expr = xpath_expr + "and @repository='"+key_array[6]+"'";
                 }else{
                         xpath_expr = xpath_expr + " and @repository=''";
                 }
-                if (key_array.length > 6){
-                        xpath_expr = xpath_expr + "and @maxDepth='"+key_array[6]+"'";
+                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 > 7){
-                        xpath_expr = xpath_expr + "and @lang='"+key_array[7]+"']";
+                if (key_array.length > 8){
+                        xpath_expr = xpath_expr + "and @lang='"+key_array[8]+"']";
                 }else{
                         xpath_expr = xpath_expr + " and @lang='']";