Changeset 1588 for MDService2

Timestamp:

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

Author:

gaba

Message:

squery removing changes

Location:

MDService2/branches/MDService_simple3

Files:

• WebContent/scripts/mdservice_model.js (modified) (13 diffs)
• WebContent/scripts/mdservice_pz2.js (modified) (1 diff)
• WebContent/scripts/mdservice_ui.js (modified) (8 diffs)
• WebContent/scripts/mdservice_ui_load.js (modified) (2 diffs)
• WebContent/static/queries.xml (modified) (1 diff)
• src/eu/clarin/cmdi/mdservice/internal/Cache.java (modified) (3 diffs)
• src/eu/clarin/cmdi/mdservice/model/Query.java (modified) (4 diffs)
• src/eu/clarin/cmdi/mdservice/proxy/MDRepoProxy.java (modified) (1 diff)
• src/xsl/params.xsl (modified) (1 diff)
• src/xsl/profile2VC.xsl (modified) (1 diff)

MDService2/branches/MDService_simple3/WebContent/scripts/mdservice_model.js

@@ -211 +211 @@
         this.columns = columns;         // string
         this.query = query;              //sctext
-        //this.squery = squery;
         this.listid = "";
         this.container = {};
@@ -314 +313 @@
         }
 
-        /*
-        if (json["squerystring"] == "[NULL]"){
-                this.squery = null;
-        } else {
-                this.squery = json["squerystring"];     
-        }
-*/
         this.columns = columns_text;
         
@@ -445 +437 @@
         var params = "?";
         if (this.query != null) {
-                params = params + "query=" + escape(this.query) + "&";
+                escaped_sq = escape(this.query);
+                //escaped_sq =escape(this.query).replace(/%20/g,"%2520").replace(/\%2[27]/g,"%2522") ;
+                //escaped_sq = escaped_sq.replace(/%7C/g,"%257C").replace(/\+/g,"%2B"); 
+                //params = params + "query=" + escape(this.query) + "&";
+                params = params + "query=" + escaped_sq + "&";
         }
         /*
@@ -490 +486 @@
         var str = "";
         var coll = (this.getcollectiontext("name") != "" ) ? " in " + this.getcollectiontext("name") : "";
-        //str = Query.queryliststring(this.squery,this.query) + coll + " @" + this.repository.toString();
-        str = Query.queryliststring(this.query) + coll + " @" + this.repository.toString();
+        str = Query.simplequerystring(this.query) + coll + " @" + this.repository.toString();
         return str;
 };
@@ -559 +554 @@
         var jsonq = {"id":this.id,
                                  "name":"",
-                             //"squerystring":this.squery, 
-                                 "querystring":this.query,      
+                             "querystring":this.query,  
                                  "searchclauses":"null" ,
                                  "collections" : json_coll, 
@@ -651 +645 @@
 Query.fullformatstring = function (json) {
         var qs = json.querystring;
-        //var sqs = json.squerystring;
         
         if (qs == "[NULL]") {
@@ -657 +650 @@
         }
         
-        /*if (sqs == "[NULL]") {
-                sqs = null;
-        }
-        */
+        
         var collection_text = Query.collectiontext(json);
         
         var full_str = "";
         var len = formatquerystring_len;
-        /*
-        if (sqs != null) {
-                if (sqs.length > len){
-                        full_str = sqs.substring(0,len) + "..| ";
-                } else {
-                        sqs = sqs + "                                     ";
-                        full_str = sqs.substring(0,len) + "  | ";
-                }
-        }
-        */
+        
         if (qs != null) {
                 qs = Query.simplequerystring(qs);
@@ -691 +672 @@
         
         return full_str;
-};
-
-Query.queryliststring = function(query) {
-        var s_squery = "";
-        var s_query = "";
-        var str = "";
-        
-        /*if (squery != null){
-                s_squery = squery;
-        }
-        
-        if (query != null){
-                s_query = query;
-        }
-        if (s_squery.length != 0 && s_query.length != 0){
-                str = squery + " & (" + Query.simplequerystring(query) +  ")";
-        } else if (s_squery.length != 0) {
-                str = squery;
-        } else {
-                str =  Query.simplequerystring(query);
-        }
-        */
-        
-        str =  Query.simplequerystring(query);
-        return str;
 };
 
@@ -770 +726 @@
 
 Query.prototype.render = function () {
-/*
-        var x = "<div id='" + this.listid + "' class='query_wrapper ui-widget' ><div class='query_header ui-widget-header ui-state-default ui-corner-top'>" +
-        "<span class='cmd cmd_get'></span><span class='cmd cmd_save'></span><span class='cmd cmd_del'> </span>" +
-        "<span class='query_id'>" +     this.listid + "</span>: <span class='query'>" +
-        this.getcollectiontext("name") + ":" + Query.queryliststring(this.squery, this.query) + ", repository:" + this.repository.toString() + "</span>" + 
-                        "<a class='cmd cmd_xml' target='_blank' href='" + this.link("xml") + "'>xml</a> <a class='cmd cmd_link' target='_blank' href='" + this.link("fullpage") + "' >link</a></div>" +
-                //      <span class='cmd cmd-xml'></span><span class='cmd cmd-page'></span><span class='cmd cmd-link'></span></div>" +          
-                        //"<div class='ui-context-dialog columns-wrapper'><div class='query-columns'></div><span class='cmd cmd_del'></span></div><div class='result ui-widget-content ui-corner-bottom'></div>";
-                        "<div class='result ui-widget-content ui-corner-bottom'></div>";
-                        */
-        /*
-        var x = $('#querylistelement').html().toString();
-        x.replace('querylistelement', this.listid);
-        $(x).find(".query-id").text(this.listid);
-        $(x).children().children(".query").text(this.getcollectiontext("name") + ":" + Query.queryliststring(this.squery, this.query) + ", repository:" + this.repository.toString());
-        */
+
         // FIXME: this is not nice, there should be a function providing the formatted string of the query.
         //var coll = (this.getcollectiontext("name") != "" ) ? " in " + this.getcollectiontext("name") : "";  
@@ -792 +733 @@
         "<span class='query_id'>" + this.listid + "</span>: <span class='query'>" +
         this.toString() + 
-        //Query.queryliststring(this.squery, this.query) + coll + " @" + this.repository.toString() + 
         "</span>" + 
                         "</div>" +
@@ -834 +774 @@
          
                 // JSON conversion
-         /*
-                if (this.query.length == 0){
-                        xqstring = "[NULL]";
-                } else {
-                        xqstring = this.query;
-                }
-                if (this.squery.length == 0){
-                        xsquery = "[NULL]";
-                } else {
-                        xsquery = this.squery;
-                }
-         */
-                //var jsonq = {"squerystring":this.squery, "querystring":this.query, "searchclauses":"null" , "collections" : this.json_coll, "columns" : this.json_cols};
-         var jsonq = { "querystring":this.query, "searchclauses":"null" , "collections" : this.json_coll, "columns" : this.json_cols};
+         var jsonq = { "querystring":this.query, "searchclauses":"null" , "collections" : this.json_coll, "columns" : this.json_cols};
 
                 var uri = "?query=" + JSON.stringify(jsonq) + "&startItem=" + this.startItem + "&maximumItems=" + this.maximumItems;
@@ -1079 +1006 @@
                 
         },
-/*
-        getsquery: function(qid) {
-                var qstring = "";
-                
-                for (var i = 0; i < this.queries.length; i++) {
-                        if (this.queries[i].listid == qid) {
-                                qstring = this.queries[i].squery;
-                        } 
-                }
-                if (qstring == null){
-                        qstring = "";
-                }
-                return qstring;
-        },
-        */
         getquerystring: function(qid) {
                 var qstring = "";
@@ -1194 +1106 @@
                 return query;
         },
-        /*
-        next: function(qid,pages){
-                var query = queryset.queries[qid.substring(1)-1];
-                var start = 0;
-                var num = 0;
-                var max_value = $('#' + qid ).find('.result-header').attr("max_value");
-                
-                if (parseInt(query.startItem) + pages * page_record_count >= 1){
-                        start = parseInt(query.startItem) + pages * page_record_count ;
-                } else if (parseInt(query.startItem) + pages * page_record_count + page_record_count - 1 >= 1){
-                        start = 1 ;
-                }
-                if (start > 0){
-                        if (start + page_record_count - 1 <= max_value) {
-                                num = page_record_count;
-                        } else if (start <= max_value){
-                                num = max_value - start;
-                        }
-                
-                        if (num > 0){
-                                query.startItem =       start;
-                                query.maximumItems = num;
-                                query.resubmit();
-                        }
-                }
-                
-        },
-        */
         recorddetailselection: function(recordrow){
                 if (this.recordrowselected != undefined){

MDService2/branches/MDService_simple3/WebContent/scripts/mdservice_pz2.js

@@ -12 +12 @@
 function pazparsubmit(q){
         q.pz2.repository = q.repository;
-        //q.pz2.init();
-        //q.pz2.search(q.squery, q.maximumItems, sort, filter, q.startItem, addParamsArr);
-        //q.pz2.search(q.squery, q.maximumItems, undefined, null, q.startItem, null);
-        q.pz2.initandsearch(q.squery, q.maximumItems, undefined, null, q.startItem, null, q.format);
+        q.pz2.initandsearch(q.query, q.maximumItems, undefined, null, q.startItem, null, q.format);
 }
 

MDService2/branches/MDService_simple3/WebContent/scripts/mdservice_ui.js

@@ -253 +253 @@
                         query = $('#input-simplequery').attr("value");
                 }
-                //searchclauseset.buildsctext();
-                //notifyUser(searchclauseset.sctext,'debug');                           
-                //submit_query (columns_widget.getColumnsListText(),searchclauseset.sctext, $('#input-simplequery').attr("value"), $('#input-withsummary').attr("checked"));    
-                //var query = searchclauseset.sctext;
-                //var squery = $('#input-simplequery').attr("value");
                 // TODO we dont use columns-widget
                 var columns = "";//columns_widget.getColumnsListText();
@@ -395 +390 @@
                 }
         });
-        /*      
-        $('#querylist .cmd_save').live('click',  function(event) {
-                
-                var qid = "";
-                var qstring = "";       
-                var json_coll = "null";
-                var json_cols = "null";
-                var squery = "";
-                var bookmark = "0";
-                var json_options = "null";
-                
-                if ($(this).parents('.result').length > 0){
-                        qstring = $(this).parent().find("a").attr('href');
-                        qstring = qstring.substring(18,qstring.length);
-                        bookmark = "1";
-                } else {
-                        qid = $(this).closest('.query_wrapper').attr("id");
-                        qstring = queryset.getquerystring(qid); 
-                        json_coll = queryset.getcollections(qid);
-                        json_cols = queryset.getcolumns(qid);
-                        squery = queryset.getsquery(qid);
-                        json_options = queryset.getoptions(qid);
-                }
-                notifyUser("saving query: " + qid, "debug");
-                // JSON conversion
-                if (qstring.length == 0){
-                        qstring = "[NULL]";
-                }
-                if (squery.length == 0){
-                        squery = "[NULL]";
-                }
-
-                var id = parseInt($("#qts_select option:selected").val());
-                var iq = $('#userqueries').children().size();
-        
-                if (iq == 0){
-                        jsonw["WorkspaceProfile"]["Querysets"][id]["Queries"] = [{}];
-                }
-                var dt = new Date();
-                var str_time = dateFormat(dt);//dt.toString("dd/mm/yyyy HH:mm:ss");
-                var jsonq = {"name":"", "squerystring":squery, "querystring":qstring,"searchclauses":"null" , "collections" : json_coll, "columns" : json_cols, "options" : json_options, "bookmark" : bookmark, "time" : str_time};
-                
-                var name;
-                if (bookmark == "1") {
-                        qstring = Url.decode(qstring);
-                        var s = qstring.split(':');
-                        name = s[s.length - 2] + ":" + s[s.length - 1];
-                } else {
-                        name = Query.fullformatstring(jsonq);
-                }
-                jsonq.name = name;
-                
-                jsonw["WorkspaceProfile"]["Querysets"][id]["Queries"][iq] = jsonq;
-                //saveWorkspace("USER");
-                Workspace.save("USER");
-                appendQueryUI(jsonw["WorkspaceProfile"]["Querysets"][id]["Queries"][iq],iq, $('#userqueries'));
-                
-                //$("#qs_select").append(new Option(Query.simplequerystring(qstring),iq));
-        });
-        */
-        /*
-        $('#querylist .cmd-xml').live('click',  function(event) {
-                var qid = $(this).closest('.query_wrapper').attr("id");
-
-                queryset.getQuery(qid).open('xml');
-        });
-        $('#querylist .cmd-page').live('click',  function(event) {
-                var qid = $(this).closest('.query_wrapper').attr("id");
-
-                queryset.getQuery(qid).open('htmlpage');
-        });
-        */
-        /*
-        $('#querylist .cmd-link').live('click',  function(event) {
-                /* var qid = $(this).closest('.query_wrapper').attr("id");
-                var qstring = queryset.getquerystring(qid);     
-                var json_coll = queryset.getcollections(qid);
-                var json_cols = queryset.getcolumns(qid);
-                var squery = queryset.getsquery(qid);
-                // JSON conversion
-                if (qstring.length == 0){
-                        qstring = "[NULL]";
-                }
-                if (squery.length == 0){
-                        squery = "[NULL]";
-                }               
-                var jsonq = {"squerystring":squery, "querystring":qstring,"searchclauses":"null" , "collections" : json_coll, "columns" : json_cols};
-                ///
-                
-                queryset.getQuery(qid).open();
-        });
-        */
-        /*
-        $('.cmd_select').live('click',  function(event) {
-                var qid = $(this).closest('.query_wrapper').attr("id");
-                                        
-                searchclauseset.sctext = queryset.getquerystring(qid);
-                searchclauseset.buildfromquerystring();
-        });
-        */
+        
         /**
          * FIXME: this looks like a typo: #queryslist -> #querylist  
@@ -816 +712 @@
 };
 
-//TODO squery remove
-function submit_query (columns, query, squery, ws) {
+function submit_query (columns, query,  ws) {
         notifyUser("processing query");
         
@@ -823 +718 @@
                 query = null;
         }
-        /*if (jQuery.trim(squery).length == 0){
-                squery = null;
-        }
-        */
+        
         var q = new Query(collections, columns, query); //actions.collections.current, query );
         q.repository = getSelectedRepository();
@@ -1024 +916 @@
                 collections_widget.load(query.collection);
                 columns_widget.load(query.columns.split(','));
-                $('#input-simplequery').attr("value",query.squery);
+                $('#input-simplequery').attr("value",query.query);
                 $('#input-withsummary').attr("checked",(query.options != null));
                 updateCollectionTree();
@@ -1048 +940 @@
         }
 
-        //var squery = url["query"];//url["squery"];
         var collection = url["collection"];
         var startItem = url["startRecord"];
@@ -1059 +950 @@
                 } else {
                         q = Url.decode(q);
-                }/*
-                if (squery == undefined) {
-                        squery = "";
-                } */
+                }
                 if (columns == undefined) {
                         columns = "";
@@ -1104 +992 @@
                 collections_widget.load(query.collection);
                 columns_widget.load(query.columns.split(','));
-                $('#input-simplequery').attr("value",query.squery);
+                $('#input-simplequery').attr("value",query.query);
                 $('#input-withsummary').attr("checked",(query.options != null));
                 updateCollectionTree();
-                /*
-                
-                searchclauseset.sctext = query.query;
-                notifyUser(searchclauseset.sctext,'debug');
-                
-                searchclauseset.buildfromquerystring();
-
-                $('#collection_list').attr("value",query.getcollectiontext("name"));
-        
-                columns_widget.load(query.columns.split(','));
-                //$('#columns_list').attr("value",query.columns);
-                $('#input-simplequery').attr("value",query.squery);     
-
-                $('#query-input').show();
-                                                                         
-                //hideWelcomeMessage();
-                */
+                
         }
         

MDService2/branches/MDService_simple3/WebContent/scripts/mdservice_ui_load.js

@@ -417 +417 @@
                 timestr = json.time;
         }
-        var squery = json.squerystring;
-        if (squery = "[NULL]"){
-                squery = "";
-        }
+        
         var qq = json.querystring;
         if (qq = "[NULL]"){
@@ -430 +427 @@
         '<div class="detail" >' +
         name +
-        '<div class="cmds-elem-prop"><span class="label">squery:</span><span class="value">' + squery + '</span></div>' +
         '<div class="cmds-elem-prop"><span class="label">query:</span><span class="value">' + Query.simplequerystring(qq) + '</span></div>' + 
         '<div class="cmds-elem-prop"><span class="label">collections:</span><span class="value">' + Query.collectiontext(json) + '</span></div>' +

MDService2/branches/MDService_simple3/WebContent/static/queries.xml

@@ -14 +14 @@
                         <dd>
                                 <ul>
-                                 <li><a class="query" href="?squery=/?squery=child%20%7C%20acquisition">child | acquisition</a></li> 
+                                 <li><a class="query" href="?query=child%20%7C%20acquisition">child | acquisition</a></li> 
                                 
                                 </ul>

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='']";

MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice/model/Query.java

@@ -67 +67 @@
         private String startItem = "1";
         private String maximumItems = "50";
-        private String squery = null;
         private String options = null;
         private String sort;
@@ -152 +151 @@
                         queryString = null;
                 }
-                /*
-                String squery = createsqueryString(squeryString);
-                if (squery != null && queryString != null){
-                        full_query_string = "(" + squery + " ) and (" + queryString + ")";
-                } else if (squery != null) {
-                        full_query_string = squery;
-                } else if (queryString != null){
-                        full_query_string = queryString;
-                } else {
-                        full_query_string = "";
-                }
-                */
+                
                 log.debug("QUERY.FULLQUERYSTRING:" + query_string);
                 if (type.equals(RECORDSET) && (query_string.length() > 0)) {    
@@ -194 +182 @@
                 if (columns!=null) {
                         this.columns = columns;
-                }
-        }
-
-        public String getSQuery() {
-                return this.squery;
-        }
-        
-        public void setSQuery(String squery) {
-                if (squery!=null) {
-                        this.squery = squery;
                 }
         }
@@ -288 +266 @@
 
         
-        // apply rules form squery
-        public String createsqueryString (String _squery){
-                String sq = null;
-                
-                if (_squery !=null){
-                        sq = "* any " + _squery;
-                }
-
-                return sq;
-        }
         public static String getSimpleQueryString(String querystring) {
                 String[] arr_and = querystring.split(" and ");

MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice/proxy/MDRepoProxy.java

@@ -63 +63 @@
         public URL getTargetRequest() throws IOException, CQLParseException {
         
-                //TODO squery removed
-                //Query query = new Query(getParam("squery"), getParam("query"),getSourceAction().getActionkey());
                 Query query = new Query(getParam("query"),getSourceAction().getActionkey());
         
-                //log.debug("MDRPx.getQ:" + getSquery() + " and (" +  getQ() + ")");
                 log.debug("MDRP.getQuery:" + getParam("query"));
                 log.debug("MDRP.getActionkey:" + getSourceAction().getActionkey());             

MDService2/branches/MDService_simple3/src/xsl/params.xsl

@@ -65 +65 @@
         
         
-        <xsl:param name="cache_cols_" >id date duration repository collection lang query squery startRecord maximumRecords maxDepth</xsl:param>   
+        <xsl:param name="cache_cols_" >id date duration repository collection lang query startRecord maximumRecords maxDepth</xsl:param>   
         <xsl:param name="cache_cols" select="tokenize($cache_cols_,'\s+')"  />
         

MDService2/branches/MDService_simple3/src/xsl/profile2VC.xsl

@@ -50 +50 @@
         <Query profile="sru-cql">
         <xsl:text disable-output-escaping="yes">&lt;![CDATA[</xsl:text> 
-                <xsl:choose>
-                        <xsl:when test="squerystring = ''">
-                                        <xsl:value-of select ="querystring"/>
-                                </xsl:when>     
-                                <xsl:when test="querystring = ''">
-                                        <xsl:value-of select ="squerystring"/>
-                                </xsl:when>                     
-                                <xsl:otherwise><xsl:value-of select ="squerystring"/> and (<xsl:value-of select ="querystring"/>)</xsl:otherwise>
-                </xsl:choose>
+                <xsl:value-of select ="querystring"/>
         <xsl:text disable-output-escaping="yes">]]&gt;</xsl:text>
         </Query>
-        <!-- 
-        <Query profile="cmdservice"><xsl:copy-of select="querystring" />
-                                <xsl:copy-of select="squerystring" /><xsl:copy-of select="collections" />
-                </Query>
-         -->
     </GeneratedBy>
 </VirtualCollection>