Changeset 1810 for MDService2

Timestamp:

03/26/12 12:21:12 (12 years ago)

Author:

gaba

Message:

scan format , base_uri

Location:

MDService2/branches/MDService_simple3/src

Files:

• eu/clarin/cmdi/mdservice/action/FCSAction.java (modified) (4 diffs)
• eu/clarin/cmdi/mdservice/action/GenericAction.java (modified) (2 diffs)
• eu/clarin/cmdi/mdservice/action/WorkspaceAction.java (modified) (3 diffs)
• mdservice.properties (modified) (1 diff)

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

@@ -22 +22 @@
 import org.w3c.dom.Node;
 
+import eu.clarin.cmdi.mdservice.internal.CQLParseException;
 import eu.clarin.cmdi.mdservice.internal.Cache;
+import eu.clarin.cmdi.mdservice.internal.NoStylesheetException;
 import eu.clarin.cmdi.mdservice.internal.Utils;
 import eu.clarin.cmdi.mdservice.model.Diagnostic;
@@ -162 +164 @@
                         addParam("scripts_url",Utils.getConfig("webscripts.uri"));
                 }
-        }
+                
+                if (params.get("base_url") == null){
+                        addParam("base_url",Utils.getConfig("base.uri"));
+                }
+                if (params.get("cache") == null){
+                        addParam("cache",Cache.SKIP);
+                } 
+        }
+        
+        @Override
+        public boolean checkTargetProxy(){
+                //if ( getTargetProxy() == null) return false;
+                return true;
+        }
+        
+        @Override
+        public void checkParams(){
+                if (getTargetProxy() != null){
+                        getTargetProxy().checkParams(); 
+                }
+        }
+        @Override
+        public InputStream getSourceStream() throws IOException, NoStylesheetException, CQLParseException {             
+                // TODO condition case scan 
+                if (getTargetProxy() == null){
+                        WorkspaceRepositoryAction wra = new WorkspaceRepositoryAction();
+                        wra.setParam("format","sruscan");
+                        wra.setType("SERVER");
+                        try {
+                                if (wra.execute() == SUCCESS){
+                                        return wra.getResultStream();
+                                }
+                        } catch (Exception e) {
+                                // TODO Auto-generated catch block
+                                e.printStackTrace();
+                        }
+                        return null;
+                }
+                return getTargetProxy().getSourceStream(); 
+                
+        }
+        /*
         @Override
         public void prepare()  {
@@ -187 +230 @@
                 super.prepare();
         }
-                
+                */
         @Override
         public void setTargetProxy(){
@@ -193 +236 @@
                 //Query query = new Query();
                 
+                if ((getRepository().equals("")) && (getParam("operation").equals("scan"))){
+                        return;
+                }
                 switch (WorkspaceProfile.RepositoryType.toRepositoryType(WorkspaceProfile.getRepositoryType(getRepository())))
                 {               

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

@@ -527 +527 @@
         }
 
+        public boolean checkTargetProxy(){
+                if ( getTargetProxy() == null) return false;
+                return true;
+        }
+        
+        public void checkParams(){
+                getTargetProxy().checkParams();
+        }
         /**
          * This is the work-horse function.
@@ -551 +559 @@
                         
                         setTargetProxy();
-                        if (getTargetProxy() == null) return;                   
-                        getTargetProxy().checkParams();
+                        if (!checkTargetProxy()) return;
+                        checkParams();
+                        
                         
                         // Do not continue if something is fatal.

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

@@ -757 +757 @@
         }
 
-public Object getQueryParent() throws XPathExpressionException{
+        public Object getQueryParent() throws XPathExpressionException{
                 
                 XPathFactory factory = XPathFactory.newInstance(); 
@@ -774 +774 @@
         }
 
-public Object getQueryVcrid() throws XPathExpressionException{
+        public Object getQueryVcrid() throws XPathExpressionException{
         
         XPathFactory factory = XPathFactory.newInstance(); 
@@ -793 +793 @@
 }
 
-public Object getVcrid() throws XPathExpressionException{
+        public Object getVcrid() throws XPathExpressionException{
         
         XPathFactory factory = XPathFactory.newInstance(); 

MDService2/branches/MDService_simple3/src/mdservice.properties

@@ -5 +5 @@
 terms.file=terms_setup.xml
 webscripts.uri = /MDService2
+base.uri = /MDService2
 virtualcollection.uri = http://clarin.ids-mannheim.de/vcr/service/virtualcollection