Changeset 1486

Timestamp:

08/18/11 22:02:35 (13 years ago)

Author:

gaba

Message:

 

Location:

MDService2/trunk/MDService2

Files:

• WebContent/scripts/mdservice_model.js (modified) (4 diffs)
• WebContent/scripts/mdservice_pz2.js (modified) (3 diffs)
• src/eu/clarin/cmdi/mdservice/action/Pz2ProxyAction.java (modified) (1 diff)

MDService2/trunk/MDService2/WebContent/scripts/mdservice_model.js

@@ -241 +241 @@
         
         
-        var res = $(this.queryobject.container).find('.result').html("");
+        var res = $(this.queryobject.container).find('.result').append(data);//html("");
         //res.append('<ul></ul>');
+        /*
         $.each(data.hits,function(){
                 //$(res.children('ul')[res.length]).append('<li>'+this+'</li>');
                 res.append(this);
         });
-        
-        if (data.activeclients == 0){
+        */      
+        
+        var result_header = $(res).children('.result-header');
+        
+        var q_header;
+        q_header = $(res).parent().find('.query_header');
+        q_header.children('.result-header').remove();
+        
+        q_header.append(result_header);                         
+        addDetailFunctionality(q_header, this);
+        
+        
+        if (Number( $(data).find(".activeclients").text() ) == 0) {
+        //if (data.activeclients == 0){
+                // update link-hrefs
+                var qid = $(res).closest('.query_wrapper').attr("id");
+                //notifyUser("result-loaded ID:" + qid,'debug');
+                
+                var q = queryset.getQuery(qid);
+                $('#' + qid ).find(".cmd_link").attr("href", q.link("fullpage"));
                 notifyUser("result-loaded",'debug');
                 
@@ -810 +829 @@
                 
                 var reptype = workspace.getRepositoryType(this.repository);
-                /*
+                
                 if (reptype=="pazpar"){
                         //pazpar handling this
@@ -816 +835 @@
                         return;
                 }
-                */
+                
                 if (reptype=="md" ){
                         uri = link('recordset',this.format, this.query_uri());
@@ -824 +843 @@
                         } else {
                                 
-                                if (reptype=="pazpar"){
-                                        uri = link('pazpar', this.format, this.query_uri());
-                                } else {
+                                //if (reptype=="pazpar"){
+                                //      uri = link('pazpar', this.format, this.query_uri());
+                                //} else {
                                 
                                         return;
-                                }
+                                //}
                         }
                 }

MDService2/trunk/MDService2/WebContent/scripts/mdservice_pz2.js

@@ -311 +311 @@
         $.get("/MDService2/pazpar2/" + this.format + "/" + params,
             function(data) {
-                if (  $(data).find("status")[0].textContent == "OK"  ) {
+                if (  $(data).find(".status").text() == "OK"  ) {
                     // first parse the status data send along with records
                     // this is strictly bound to the format
-                    var activeClients = Number( $(data).find("activeclients")[0].textContent );
+                    var activeClients = Number( $(data).find(".activeclients").text() );
                     context.activeClients = activeClients; 
+                    /*
                     var show = {
                         "activeclients": activeClients,
@@ -326 +327 @@
                         "num": 
                             Number( $(data).find("num")[0].textContent ),
-                        "hits": $(data).find("hit")//[]
+                        "hits": $(data)//.find("hit")//[]
                     };
+                    */
                     // parse all the first-level nodes for all <hit> tags
                     //var hits = $(data).find("hit");
@@ -344 +346 @@
                             delay);
                     }
-                    global_show = show;
-                    context.showCallback(show);
+                    global_show = $(data);//show;
+                    context.showCallback($(data));
                 }
                 else

MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action/Pz2ProxyAction.java

@@ -204 +204 @@
                 setBlock("1");
                 while (Integer.parseInt(activeclients) > 0){
-                        activeclients = getDocumentData(this.getSourceStream(), "//show/activeclients");
+                        //activeclients = getDocumentData(this.getSourceStream(), "//show/activeclients");
                         is = this.getSourceStream();
+                        activeclients = getDocumentData(is, "//show/activeclients");
                         
                 }
+                is = this.getSourceStream();
                 return is;
         }