Changeset 1807 for MDService2

Timestamp:

03/23/12 10:30:34 (12 years ago)

Author:

gaba

Message:

fcs/scan

Location:

MDService2/branches/MDService_simple3/src

Files:

• eu/clarin/cmdi/mdservice/action/FCSAction.java (modified) (3 diffs)
• eu/clarin/cmdi/mdservice/action/SRUAction.java (modified) (1 diff)
• eu/clarin/cmdi/mdservice/action/WorkspaceAction.java (modified) (3 diffs)
• eu/clarin/cmdi/mdservice/proxy/FCSProxy.java (modified) (3 diffs)
• mdservice.properties (modified) (2 diffs)
• xsl/params.xsl (modified) (1 diff)
• xsl/xml2sruscan.xsl (added)

MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice/action/FCSAction.java

@@ -97 +97 @@
         }
 
+        @Override
+        public String getFullFormat() {         
+                return getActionkey() + getOperation() + "2" + getFormat();
+        }
+        
         public void addFCSParam(String key, String value){
                 String[] sarr = new String[1];
@@ -130 +135 @@
         
         @Override
+        public String getFormat() {
+                if (getParams().get("x-format") == null){
+                                return "xml";
+                }
+                return getParam("x-format");
+                
+        }
+        
+        @Override
         protected void setDefaultParams(){
                 // set defaults
                 
-                if  (params.get("repository") == null){
-                        if (params.get("x-context") == null){
-                                addParam("repository",WorkspaceProfile.getRepositoryByIndex(0));
-                        } else {
+                        if (params.get("x-context") != null){
+                                
                                 // search in fcs-mapping
                                 if (WorkspaceProfile.getFCSMapping(params.get("x-context")[0]) == null){
@@ -144 +156 @@
                                 }
                         }       
-                }       
-                
-        }
+
+                addParam("fullformat",getFullFormat());
+        }
+        @Override
+        public void prepare()  {
+                
+                loadParams();
+                // case scan
+                if ((getRepository().equals("")) && (getParam("operation").equals("scan"))){
+                        //TODO
+                        WorkspaceRepositoryAction wra = new WorkspaceRepositoryAction();
+                        wra.setParam("format","sruscan");
+                        wra.setType("SERVER");
+                        try {
+                                if (wra.execute() == SUCCESS){
+                                        setResultStream(wra.getResultStream());
+                                }
+                        } catch (Exception e) {
+                                // TODO Auto-generated catch block
+                                e.printStackTrace();
+                        }
+                        
+                        //WorkspaceProfile.getRepositories()
+                        return;
+                }
+                super.prepare();
+        }
+                
         @Override
         public void setTargetProxy(){
                 
                 //Query query = new Query();
+                
                 switch (WorkspaceProfile.RepositoryType.toRepositoryType(WorkspaceProfile.getRepositoryType(getRepository())))
                 {               

MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice/action/SRUAction.java

@@ -89 +89 @@
         }
         
+        public String getOperation() {
+                if (getParams().get("operation") == null){
+                        return "searchRetrieve";
+                }
+                return getParam("operation");
+        }
+        
          protected final static HashMap<String,Integer> operation_code = new HashMap<String,Integer>();
          static

MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice/action/WorkspaceAction.java

@@ -46 +46 @@
 import org.xml.sax.SAXException;
 
+import eu.clarin.cmdi.mdservice.internal.Cache;
 import eu.clarin.cmdi.mdservice.internal.Utils;
 import eu.clarin.cmdi.mdservice.internal.MDTransformer;
 import eu.clarin.cmdi.mdservice.model.Diagnostic;
+import eu.clarin.cmdi.mdservice.model.WorkspaceProfile;
 
 
@@ -208 +210 @@
         }
         
+        @Override
+        protected void setDefaultParams(){
+                
+                addParam("fullformat",getFullFormat());
+        }
         //@Override
         public URL getBaseURL() {
@@ -267 +274 @@
         @Override
         public String getFullFormat() {
-                return "xml2json";
+                return "xml2" + getFormat();
         }
         

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

@@ -2 +2 @@
 
 import java.io.IOException;
+import java.net.MalformedURLException;
 import java.net.URL;
 
 import org.apache.log4j.Logger;
 
+import eu.clarin.cmdi.mdservice.action.WorkspaceRepositoryAction;
 import eu.clarin.cmdi.mdservice.internal.CQLParseException;
 import eu.clarin.cmdi.mdservice.model.Diagnostic;
+import eu.clarin.cmdi.mdservice.model.Diagnostics;
 import eu.clarin.cmdi.mdservice.model.Query;
 import eu.clarin.cmdi.mdservice.model.WorkspaceProfile;
@@ -38 +41 @@
                         getSourceAction().getDiagnostics().Add(Diagnostic.MANDATORY_NOTSUPPLIED, "operation");
                 }
-                
+                /*
                 if (getParam("query").equals("") && getParam("operation").equals("searchRetrieve")) {
                         getSourceAction().getDiagnostics().Add(Diagnostic.MANDATORY_NOTSUPPLIED, "query");
@@ -45 +48 @@
                         getSourceAction().getDiagnostics().Add(Diagnostic.MANDATORY_NOTSUPPLIED, "scan");
                 }
+*/
 
-
+                
         }
         
+        public String getRepositoryURI() {              
+                String uri = "http://localhost:8080/MDService2/repository?format=scanxml";//WorkspaceProfile.getRepositoryPath(getSourceAction().getRepository());              
+                return uri;
+        }
+
+        
+        /**
+         * Provides the repostory-URL specific to given target repository or registry 
+         * @return
+         * @throws MalformedURLException
+         */     
+        public URL getScanRepositoryURL() throws MalformedURLException {                
+                URL url = new URL(getRepositoryURI() + "?format=sruscan" );             
+                return url;
+        }
+        /**
+         * the operations scan, explain 
+         * or in getSOurceStream??
+         */     
+        /*
+        @Override
+        public URL getTargetRequest() throws IOException, CQLParseException {
+                
+                URL targetURL;
+                if (getSourceAction().getParam("operation").equals("scan") && getSourceAction().getParam("x-context").equals("")) {// && getSourceAction().getParam("scanClause").equals("fcs.resource")){
+                        targetURL = getScanRepositoryURL();
+                } else {
+                        targetURL =  super.getTargetRequest();
+                }
+                
+                log.debug("getTargetRequest().targetURL:" + targetURL);
+            return targetURL;
+                
+        }
+        */
 }

MDService2/branches/MDService_simple3/src/mdservice.properties

@@ -28 +28 @@
 xsl.sru2htmlpage = sru2view.xsl
 xsl.sru2htmltable = sru2view.xsl
+xsl.fcsscan2htmlpage = fcs/scan2view.xsl
+xsl.fcsexplain2htmlpage = fcs/explain2view.xsl
+xsl.fcssearchRetrieve2htmlpage = fcs/result2view_v1.xsl
 xsl.pazpar22htmlpage = mdset_pazpar2view.xsl
 xsl.pazpar22htmlpagelist = mdset_pazpar2view.xsl
@@ -72 +75 @@
 xsl.terms2txt = complist2termstxt.xsl
 xsl.xml2json = xml2json.xsl
+xsl.xml2sruscan = xml2sruscan.xsl
 xsl.attr2elements = attr2elements.xsl
 

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

@@ -16 +16 @@
         <xsl:param name="base_js_url" select="concat($base_dir, '/search/htmljspage')" />               
         <xsl:param name="docs_baseuri" select="concat($base_dir, '/docs/htmlpage/welcome')" />
+        <xsl:param name="repository_baseuri" select="concat($base_url, '/repository')" />
         
         <!-- momentary used in dcif2view.xsl to select appropriate language section