Changeset 1467 for MDService2/trunk/MDService2/src/eu/clarin/cmdi

Timestamp:

07/22/11 21:31:08 (13 years ago)

Author:

gaba

Message:

SRU queries added

Location:

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

Files:

• GenericProxyAction.java (modified) (2 diffs)
• SRUProxyAction.java (modified) (15 diffs)

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

@@ -525 +525 @@
         public Boolean isSRURepository(){
                 //Boolean issru = false;
-                String srustr = "";
+                String typestr = "";
                 
                 if (repositories == null ) {
@@ -545 +545 @@
                 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"));
+                                typestr =  json.getJSONObject(i).getString("type");
+                        }
+                }
+                
+                return (typestr.equals("sru"));
                 
         }

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

@@ -53 +53 @@
 
 
-public class SRUProxyAction extends ActionSupport
-implements ServletRequestAware 
+public class SRUProxyAction extends GenericProxyAction//ActionSupport
+//implements ServletRequestAware 
 {
 
@@ -82 +82 @@
         private MDRepoProxyAction mdrepoproxyaction;
         private TermsProxyAction termsproxyaction;
-        private InputStream resultStream;
-        private HttpServletRequest request; 
+        //private InputStream resultStream;
+        //private HttpServletRequest request; 
         
         private static int OP_SEARCHRETRIEVE = 1;
         private static int OP_EXPLAIN = 2;
         private static int OP_SCAN = 3;
+        
+        //TODO cache after analysis
+        @Override
+        public String getCache() {
+                return Cache.SKIP;
+        }
         
         private final static HashMap<String,String> hash_operations = new HashMap<String,String>();
@@ -116 +122 @@
          }
          
-         @Override
+         /*@Override
                 public void setServletRequest(HttpServletRequest arg0) {
                         request = arg0;
@@ -124 +130 @@
                         return request;
                 }
-                
+                */
                 public Diagnostics getDiagnostics(){
                         return this.diagnostics;
@@ -141 +147 @@
                         this.q = q;
                 }
-         
+         /*
          public InputStream getResultStream() {
              return resultStream;
@@ -148 +154 @@
                 resultStream = _resultStream;
          }
-        
+        */
 
         public String getVersion() {
@@ -264 +270 @@
         
         public String getDiagnosticStreamName() throws TransformerConfigurationException, UnsupportedEncodingException, ParserConfigurationException, TransformerException, TransformerFactoryConfigurationError{
-                resultStream = this.Diagnostics().buildXMLStream();
+                this.setResultStream(this.Diagnostics().buildXMLStream());
                 return "resultStream";
         }
@@ -275 +281 @@
         public String getProxyKey() {
                 return "";
+        }
+        
+        @Override
+        public String getBaseURI() {            
+                Admin.notifyUser("SRU-repositorypath:" + getRepositoryPath());
+                String uri = getRepositoryPath();//Admin.getConfig().getProperty(getProxyKey() + ".uri");               
+                return uri;
         }
         
@@ -346 +359 @@
                                                                 XMLSerializer xmlserializer = new XMLSerializer();
                                                                 String xml = xmlserializer.write( mdrepoproxyaction.getRepositories() );  
-                                                                resultStream = new ByteArrayInputStream(xml.getBytes("UTF-8")); 
+                                                                this.setResultStream(new ByteArrayInputStream(xml.getBytes("UTF-8"))); 
 
                                                         } else {
@@ -359 +372 @@
         }
         
-        public void prepare() throws UnsupportedEncodingException{
+        public void sru2MD() throws UnsupportedEncodingException{
                 // special handling of parameter setting, x-cmd-... not alowed in java
                 this.setX_cmd_collections(getServletRequest().getParameter("x-cmd-collections"));
@@ -393 +406 @@
         }
         
+        public void  prepareMD() throws Exception{
+                sru2MD();
+                if (Diagnostics().Accepted()){
+                        // root-explain
+                        if (this.termsproxyaction != null) {                    
+                                if (this.termsproxyaction.execute() == SUCCESS){
+                                        this.setResultStream(this.termsproxyaction.getResultStream());
+                                        //return SUCCESS;
+                                }
+                        } else {
+                                //TODO diagnostic                        
+                                if (this.mdrepoproxyaction.getTargetRequest() == null) {
+                                        Diagnostics().Add(Diagnostic.QUERYSYNTAXERROR);
+                                        //return ERROR;
+                                }
+                                if (this.mdrepoproxyaction.execute() == SUCCESS){
+                                        this.setResultStream(this.mdrepoproxyaction.getResultStream());
+                                        postprocess();
+                                        //return SUCCESS;
+                                }
+                        }
+                }
+                //return ERROR;
+        }
+        
         public static String inputStreamAsString(InputStream stream)
                 throws IOException {
@@ -435 +473 @@
                         if (this.getRecordPacking().toLowerCase().equals("string")){
                                 try {
-                                        resultStream = IOUtils.toInputStream(StringEscapeUtils.escapeXml(inputStreamAsString(resultStream)));
+                                        this.setResultStream(IOUtils.toInputStream(StringEscapeUtils.escapeXml(inputStreamAsString(this.getResultStream()))));
                                 } catch (IOException e) {
                                         // TODO Auto-generated catch block
@@ -446 +484 @@
                 // add diagnostics
                 if (Diagnostics().Exists()){
-                        Document doc = newDocumentFromInputStream(resultStream);
+                        Document doc = newDocumentFromInputStream(this.getResultStream());
                         Node r_element=  doc.getElementsByTagName("searchRetrieveResponse").item(0);
                         Document ddoc = Diagnostics().buildXMLDocument();
@@ -456 +494 @@
                         StreamResult result = new StreamResult(xmlAsWriter);    
                         TransformerFactory.newInstance().newTransformer().transform(source, result);
-                        resultStream = new ByteArrayInputStream(xmlAsWriter.toString().getBytes("UTF-8"));
-                }
-        }
-        
+                        this.setResultStream(new ByteArrayInputStream(xmlAsWriter.toString().getBytes("UTF-8")));
+                }
+        }
+        
+        @Override
+        public URL getTargetRequest() throws IOException {
+                String requestURI = "";
+                URL targetURL;
+                
+                if (this.getBaseURI() == null){
+                        requestURI = this.getX_cmd_repository();
+                } else {
+                        requestURI = this.getBaseURI();
+                }
+                //TODO params
+                Set set = getServletRequest().getParameterMap().entrySet();
+                Iterator i = set.iterator();
+                String params = "";
+            while(i.hasNext()){
+                      Map.Entry me = (Map.Entry)i.next();
+                      if (!(me.getKey().equals("x-cmd-repository") || me.getKey().equals("x-cmd-collections"))){
+                              params = params + "&" + me.getKey() + "=" + ((String[])me.getValue())[0];  
+                      }
+                }
+            params = params.substring(1);
+            targetURL = new URL(requestURI + "?" + params);
+                return targetURL;
+        }
+        
+        @Override 
+        public void prepare() throws Exception{
+                this.setX_cmd_repository(getServletRequest().getParameter("x-cmd-repository"));
+                this.setRepository(this.getX_cmd_repository());
+                //TODO xsl usage according particular repositories ?
+                //this.setActionkey("recordset");
+                this.setFormat("xml");
+                
+                //extern SRU repository
+                if (this.isSRURepository() || this.getBaseURI() == null){
+                        super.prepare();
+                }
+                else {
+                         prepareMD();
+                }
+                
+        }
         /**
          * default Action method
          */
+        /*
         public String execute() throws Exception {
                 this.setX_cmd_repository(getServletRequest().getParameter("x-cmd-repository"));
@@ -514 +595 @@
                 return ERROR;
         }
-
+*/
 
 }