Changeset 1483

Timestamp:

08/18/11 14:03:15 (13 years ago)

Author:

gaba

Message:

pazpar server version

Location:

MDService2/trunk/MDService2

Files:

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

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

@@ -810 +810 @@
                 
                 var reptype = workspace.getRepositoryType(this.repository);
-                
+                /*
                 if (reptype=="pazpar"){
                         //pazpar handling this
@@ -816 +816 @@
                         return;
                 }
-                
+                */
                 if (reptype=="md" ){
                         uri = link('recordset',this.format, this.query_uri());
@@ -823 +823 @@
                                 uri = link('sru', this.format, this.sruquery_uri());
                         } else {
-                                /*
+                                
                                 if (reptype=="pazpar"){
                                         uri = link('pazpar', this.format, this.query_uri());
                                 } else {
-                                */
+                                
                                         return;
-                                //}
+                                }
                         }
                 }

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

@@ -138 +138 @@
         @Override
         public InputStream getSourceStream() throws IOException {
-                if (getCommand().equals("")){
+                if (getCommand() == null){
                         try {
                                 return getSourcePz2();
@@ -196 +196 @@
                 setCommand("search");
                 setSessionID(sessionID);
+                setQuery(this.getSquery());
                 String ok = getDocumentData(this.getSourceStream(),"//search/status");
                 
                 String activeclients = "1";
                 setCommand("show");
+                setSort("relevance");
+                setBlock("1");
                 while (Integer.parseInt(activeclients) > 0){
+                        activeclients = getDocumentData(this.getSourceStream(), "//show/activeclients");
                         is = this.getSourceStream();
-                        activeclients = getDocumentData(is, "//show/activeclients");
                         
                 }