Changeset 1509 for MDService2/branches/MDService_simple/src/eu/clarin/cmdi/mdservice/action/RepoProxyAction.java

Timestamp:

09/03/11 11:58:22 (13 years ago)

Author:

vronk

Message:

intermediate version reworking RepoProxyAction? - adding a target_proxy

File:

• MDService2/branches/MDService_simple/src/eu/clarin/cmdi/mdservice/action/RepoProxyAction.java (modified) (4 diffs)

MDService2/branches/MDService_simple/src/eu/clarin/cmdi/mdservice/action/RepoProxyAction.java

@@ -44 +44 @@
 
         private String proxy_key = "repository";
-        
+        private RepoProxyAction target_proxy;
+        private RepoProxyAction source_action;
+        
+/**
+ * Based on the repository type - we create a typed Proxy, that will do the work.
+ * If the type is not recognized <this> will be also the target_proxy - 
+ * TODO: check if it is sane, to work without a typed target_proxy   
+ */
+        protected void  initialize(){
+                
+                switch (WorkspaceProfile.RepositoryType.toRepositoryType(WorkspaceProfile.getRepositoryType(getRepository())))
+                {               
+                    case PAZPAR: 
+                        target_proxy = new Pz2ProxyAction();
+                    case SRU:
+                        target_proxy = new SRUProxyAction();
+                    case MD:
+                        target_proxy = new MDRepoProxyAction();
+                    default:
+                        target_proxy = this;
+                }
+                target_proxy.setSourceAction(this);
+                
+        }
+        
+        public RepoProxyAction getTargetProxy() {
+                return target_proxy;
+        }
+
+        public RepoProxyAction getSourceAction() {
+                return source_action;
+        }
+        
+        public void setSourceAction(RepoProxyAction p_source_action) {
+                source_action = p_source_action;
+        }
+        
+/** 
+ * Pass the proxy_key of the actual target_proxy,
+ * or the basic "repository" if the target_proxy is identical  
+ */
         @Override
         public String getProxyKey() {
-                return proxy_key;
+                if (target_proxy.equals(this)) {
+                  return proxy_key;
+                } else {                
+                        return getTargetProxy().getProxyKey();
+                }
         }
 
@@ -60 +104 @@
         }
         
-        /**
-         * A mapping between the actionkeys in the request and the operation-parameter expected by the MD!Repository 
-         * FIXME: This is taken from MDRepoProxyAction - so it will not work for SRU and Pazpar2
-         */
-        private final static HashMap<String,String> urls = new HashMap<String,String>();
-         static
-         {       urls.put("collection", "?operation=getCollections&collection=");
-                 urls.put("model", "?operation=queryModel&q=");
-                 urls.put("values", "?operation=scanIndex&q=");
-                 urls.put("search", "?operation=searchRetrieve&query=");
-                 urls.put("record", "?operation=searchRetrieve&query=");
-         } 
-
-        
         //TODO remove - just for tests
         @Override
@@ -106 +136 @@
         }
         
-public URL getTargetRequestSRU() throws IOException, NoStylesheetException{
-        
-        SRUProxyAction sruaction = new SRUProxyAction();
-        // TODO MD to SRU params
-        // missing collections, columns...
-        sruaction.setOperation("searchRetrieve");
-        //TODO what version
-        sruaction.setVersion("1.2");
-        sruaction.setStartRecord(Integer.parseInt(this.getStartItem()));
-        sruaction.setMaximumRecords(Integer.parseInt(this.getMaximumItems()));
-        sruaction.setRepository(getRepository());
-        sruaction.setQuery(this.fullQueryString());
-        
-        return sruaction.getTargetRequest();
-        
-}
-public InputStream getSourcePz2() throws Exception {
-                
-                InputStream is = null;
-                Pz2ProxyAction pzaction = new Pz2ProxyAction();
-                // TODO param settings
-                //init
-                pzaction.setRepository(getRepository());
-                pzaction.setCommand("init");
-                String sessionID = Helpers.getDocumentData(pzaction.getSourceStream(), "//init/session");
-                // get result
-                pzaction.setCommand("search");
-                pzaction.setSessionID(sessionID);
-                pzaction.setQuery(this.fullQueryString());
-                String ok = Helpers.getDocumentData(pzaction.getSourceStream(),"//search/status");
-                
-                String activeclients = "1";
-                pzaction.setCommand("show");
-                pzaction.setSort("relevance");
-                pzaction.setBlock("1");
-                //TODO timeout  settings
-                long startMillis = System.currentTimeMillis();
-                long timeout = 0;
-                if (WorkspaceProfile.getOption("pazpartimeout") == null){
-                        timeout = 1000;
-                } else {
-                        timeout = Integer.parseInt(WorkspaceProfile.getOption("pazpartimeout"));
-                }
-                while (Integer.parseInt(activeclients) > 0){
-                        //activeclients = getDocumentData(this.getSourceStream(), "//show/activeclients");
-                        is = pzaction.getSourceStream();
-                        activeclients = Helpers.getDocumentData(is, "//show/activeclients");
-                        Thread.sleep(1000); 
-                        Admin.notifyUser("ActiveClients: " + activeclients, Admin.DEBUG);
-                        if ((System.currentTimeMillis() - startMillis)/1000 > timeout) {
-                                break;
-                        }
-                }
-                is = pzaction.getSourceStream();
-                return is;
-        }
-                
         @Override
         public InputStream getSourceStream() throws IOException, NoStylesheetException {
-                
-                
+        
+                return getTargetProxy().getSourceStream();
+                /*
                 switch (WorkspaceProfile.RepositoryType.toRepositoryType(WorkspaceProfile.getRepositoryType(getRepository())))
                 {
@@ -183 +157 @@
                         return super.getSourceStream();
                 }
-                
+                */
         }