Changeset 1510 for MDService2

Timestamp:

09/03/11 12:17:02 (13 years ago)

Author:

vronk

Message:

now, it at least compiles

Location:

MDService2/branches/MDService_simple/src/eu/clarin/cmdi/mdservice/action

Files:

• DocsAction.java (deleted)
• Pz2ProxyAction.java (modified) (1 diff)
• RepoProxyAction.java (modified) (2 diffs)
• SRUProxyAction.java (modified) (1 diff)

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

@@ -231 +231 @@
                 long startMillis = System.currentTimeMillis();
                 long timeout = 0;
-                if (this.getWPOption("pazpartimeout") == null){
+                if (WorkspaceProfile.getOption("pazpartimeout") == null){
                         timeout = 1000;
                 } else {
-                        timeout = Integer.parseInt(this.getWPOption("pazpartimeout"));
+                        timeout = Integer.parseInt(WorkspaceProfile.getOption("pazpartimeout"));
                 }
                 while (Integer.parseInt(activeclients) > 0){

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

@@ -147 +147 @@
                                         return getSourcePz2();
                                 } catch (Exception e) {
-                                        // TODO Auto-generated catch block
+                                        // TODO Auto-,generated catch block
                                         e.printStackTrace();
                                 }
@@ -189 +189 @@
                 Admin.notifyUser("RPA.getActionkey:" + getActionkey());         
                 
-                Query query = new Query(getSquery(), getQ(),getActionkey());
-
-        // check if the query could get parsed
-                if (query.isStatus(Query.PARSEERROR)) {
-                        Admin.notifyUser("RPA.query.PARSEERROR:" + query.getMsg());
-                        // pass this bad news to the client
-                        setUserMsg(query.getMsg());
-                        return null;
-                } else {
-                        query.setMaxdepth(getMaxdepth());               
-                        query.setCollection(getCollection());
-                        query.setColumns(getColumns());
-                        query.setMaximumItems(getMaximumItems());
-                        query.setStartItem(getStartItem());
-                        query.setOptions(getOptions());
-                        query.setSort(getSort());
-                
-                        URL targetURL = null;
-                        targetURL =new URL( getBaseURL(), urls.get(getActionkey()) + query.toURLParam() );
-                        Admin.notifyUser("RPA.targetURL.query.toURLParam:" + query.toURLParam());
+                
+//              Query query = new Query(getSquery(), getQ(),getActionkey());
+
+                 
+                        URL targetURL = getTargetProxy().getTargetRequest();
+                        // targetURL =new URL( getBaseURL(), urls.get(getActionkey()) + query.toURLParam() );
+                        
+                        //Admin.notifyUser("RPA.targetURL.query.toURLParam:" + query.toURLParam());
                         Admin.notifyUser("RPA.targetURL:" + targetURL);
                 return targetURL;
-                }
+                
         }
 

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

@@ -442 +442 @@
         }
         
+/** TODO: move to Utils
+ * 
+ * @param stream
+ * @return
+ * @throws IOException
+ */
         public static String inputStreamAsString(InputStream stream)
                 throws IOException {