Changeset 1455 for MDService2

Timestamp:

06/29/11 21:54:52 (13 years ago)

Author:

gaba

Message:

sru-reader first version

Location:

MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice

Files:

• action/GenericProxyAction.java (modified) (1 diff)
• action/SRUProxyAction.java (modified) (4 diffs)
• model/Query.java (modified) (6 diffs)

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

@@ -523 +523 @@
         }
         
+        public Boolean isSRURepository(){
+                //Boolean issru = false;
+                String srustr = "";
+                
+                if (repositories == null ) {
+                        try {
+                                setRepositories(GenericProxyAction.createRepositories());
+                        } catch (IOException e) {
+                                // TODO Auto-generated catch block
+                                e.printStackTrace();
+                        } catch (InterruptedException e) {
+                                // TODO Auto-generated catch block
+                                e.printStackTrace();
+                        } catch (TransformerException e) {
+                                // TODO Auto-generated catch block
+                                e.printStackTrace();
+                        }
+                }
+                // static repositories
+                net.sf.json.JSONArray json = getRepositories(); 
+                for(int i=0;i<json.size();i++){
+                        if (json.getJSONObject(i).getString("name").equals(getRepository())){
+                                srustr =  json.getJSONObject(i).getString("sruextern");
+                        }
+                }
+                
+                return (srustr.equals("1"));
+                
+        }
         public String addDurationKey(){
                 String req_key = getRequestKey();

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

@@ -15 +15 @@
 import java.net.URL;
 import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
 
 import javax.servlet.http.HttpServletRequest;
@@ -287 +290 @@
                 mdrepoproxyaction.setActionkey(hash_operations.get(this.getOperation()));
                 
+                // set the SRU extern property in proxyaction
+                if (this.getX_cmd_repository() != null ) {
+                        mdrepoproxyaction.setRepository(this.getX_cmd_repository());
+                        //TODO\
+                        if (mdrepoproxyaction.getBaseURI() == null) this.Diagnostics().Add(Diagnostic.UNSUPPORTED_PARAMETERVALUE, "Unknown repository." + getX_cmd_repository());
+                }
+                
                 if (operation.equals("searchRetrieve")){
                         
@@ -351 +361 @@
         public void prepare() throws UnsupportedEncodingException{
                 // special handling of parameter setting, x-cmd-... not alowed in java
-                this.setX_cmd_repository(getServletRequest().getParameter("x-cmd-repository"));
                 this.setX_cmd_collections(getServletRequest().getParameter("x-cmd-collections"));
                 
-                // root call
+                // root call own SRU SERVER
                 //operation
                 if (operation.equals("explain") || operation == null){
@@ -455 +464 @@
          */
         public String execute() throws Exception {
+                this.setX_cmd_repository(getServletRequest().getParameter("x-cmd-repository"));
+                //check if extern SRU repository
+                if (this.getX_cmd_repository() != null){
+                        MDRepoProxyAction a = new MDRepoProxyAction();
+                        a.setRepository(this.getX_cmd_repository());
+                        // direct SRU - URL
+                        if (a.isSRURepository() || (a.getBaseURI() == null)){
+                                String requestURL = "";
+                                if (a.getBaseURI() == null){
+                                        requestURL = this.getX_cmd_repository();
+                                } else {
+                                        requestURL = a.getBaseURI();
+                                }
+                                Set set = getServletRequest().getParameterMap().entrySet();
+                                Iterator i = set.iterator();
+                                String params = "";
+                            while(i.hasNext()){
+                                      Map.Entry me = (Map.Entry)i.next();
+                                      params = params + "&" + me.getKey() + "=" + ((String[])me.getValue())[0];
+                                }
+                            params = params.substring(1);
+                            URL url = new URL(requestURL + "?" + params);
+                            //getServletRequest().getRequestURL()
+                            resultStream =  url.openStream();//getServletRequest().getRequestURL().openStream();
+                                return SUCCESS;                         
+                        }
+                }
                 prepare();
                 if (Diagnostics().Accepted()){

MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/model/Query.java

@@ -14 +14 @@
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
 
 import javax.xml.parsers.DocumentBuilder;
@@ -33 +36 @@
         public static String RECORDSET = "recordset";
         public static String RECORD = "record";
+        public static String SRUEXTERN = "sruextern";
         
         public static String PARSED = "parsed";
@@ -64 +68 @@
         private int maxdepth=1;
         
+        private Map sruMap = null;
         /**
          * reference to the result-object
@@ -278 +283 @@
         }
 
+        
+        public Map getSruMap() {
+                return sruMap;
+        }
+
+        public void setSruMap(Map sruMap) {
+                this.sruMap = sruMap;
+        }
+
+        
         // apply rules form squery
         public String createsqueryString (String _squery){
@@ -342 +357 @@
                 if (type.equals(MODEL)) {
                         targetRequest = fromCMDIndex2Xpath() + "&maxdepth=" + getMaxdepth()  ; /* + "&maxdepth=" + getMaxdepth() );  "&collection=" + getCollection() + */
+                } else if (type.equals(SRUEXTERN)) {
+                        targetRequest = "";//fromCMDIndex2Xpath() + "&maxdepth=" + getMaxdepth()  ; /* + "&maxdepth=" + getMaxdepth() );  "&collection=" + getCollection() + */
+                        
+                        Set set = sruMap.entrySet();
+                        Iterator i = set.iterator();
+                        
+                    while(i.hasNext()){
+                              Map.Entry me = (Map.Entry)i.next();
+                              targetRequest = targetRequest + "&" + me.getKey() + "=" + me.getValue();
+                        }
+                                        
                 } else if (type.equals(VALUES)) {
                         targetRequest = fromCMDIndex2Xpath() ; /* + "&maxdepth=" + getMaxdepth() );  "&collection=" + getCollection() + */
@@ -363 +389 @@
                         Admin.notifyUser("Query.toURLParam.corrid=" + corrid);
                         targetRequest = "//MdSelfLink[ft:query(.,'" + corrid + "')]";                    
-                } else { 
-                        if (query_cql == null){
-                                targetRequest =  "//*" + "&collection=" + getCollection();
-                        } else {
-                                targetRequest = toXPath() + "&collection=" + getCollection();   
-                        }
-                        if (startItem != null) {
-                                targetRequest = targetRequest +  "&startItem=" + getStartItem();
-                        }
-                        if (maximumItems != null) {
-                                targetRequest = targetRequest +  "&maxItems=" + getMaximumItems();
-                        }
-                        if ((options != null)) {
-                                targetRequest = targetRequest +  "&format=xml-" + getOptions();
-                        }
-                }
-                
+                } else {
+                                if (query_cql == null){
+                                        targetRequest =  "//*" + "&collection=" + getCollection();
+                                } else {
+                                        targetRequest = toXPath() + "&collection=" + getCollection();   
+                                }
+                                if (startItem != null) {
+                                        targetRequest = targetRequest +  "&startItem=" + getStartItem();
+                                }
+                                if (maximumItems != null) {
+                                        targetRequest = targetRequest +  "&maxItems=" + getMaximumItems();
+                                }
+                                if ((options != null)) {
+                                        targetRequest = targetRequest +  "&format=xml-" + getOptions();
+                                }
+                }
+        
                 return targetRequest;
                 
-        }
+}
         
         /**