Changeset 1835

Timestamp:

04/02/12 11:37:39 (12 years ago)

Author:

gaba

Message:

corrections

Location:

MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice

Files:

• action/FCSAction.java (modified) (2 diffs)
• model/WorkspaceProfile.java (modified) (4 diffs)
• proxy/FCSProxy.java (modified) (1 diff)

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

@@ -86 +86 @@
         @Override
         public String getRepository() {
-                if (getParam("operation").equals("searchRetrieve") && !getParam("x-context").equals("")){
+                if (!getParam("x-context").equals("")){
                         if (FCSRepositories.getFCSRepositories().getFCSMapping(params.get("x-context")[0]) == null){
                                                 return getParam("x-context");
@@ -132 +132 @@
                                 addFCSParam("query",params.get("query")[0]);
                         }
-                        if ( params.get("x-context") != null){
-                                /*if (WorkspaceProfile.getFCSMapping(params.get("x-context")[0]) != null){
+                        if ( !this.getParam("x-context").equals("")){
+                                if (FCSRepositories.getFCSRepositories().getFCSMapping(params.get("x-context")[0]) != null){
                                         addFCSParam("x-context",params.get("x-context")[0]);
                                 }
-                                */
                                 
                         }

MDService2/branches/MDService_simple3/src/eu/clarin/cmdi/mdservice/model/WorkspaceProfile.java

@@ -1 +1 @@
 package eu.clarin.cmdi.mdservice.model;
 
-import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileWriter;
 import java.io.IOException;
@@ -10 +8 @@
 import java.io.StringWriter;
 import java.io.UnsupportedEncodingException;
-import java.net.URL;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -42 +39 @@
 
 import net.sf.json.JSON;
-import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 import net.sf.json.JSONSerializer;
 import net.sf.json.xml.XMLSerializer;
-import eu.clarin.cmdi.mdservice.internal.MDTransformer;
 import eu.clarin.cmdi.mdservice.internal.Utils;
-import eu.clarin.cmdi.mdservice.action.FCSAction;
-import eu.clarin.cmdi.mdservice.action.WorkspaceAction;
-import eu.clarin.cmdi.mdservice.internal.NoStylesheetException;
 
 /**
@@ -91 +83 @@
         public static String XPATH_EXPR_BOOKMARKSET = "//Profiles/WorkspaceProfiles/WorkspaceProfile/Bookmarksets/item[id='dummy']";
         public static String XPATH_EXPR_BOOKMARK_PARENT = "//Profiles/WorkspaceProfiles/WorkspaceProfile/Bookmarksets/item[id='dummy']/Bookmarks";
-        /////
-        private static HashMap<String,String> fcs_mapping = null;
-        
         
         public void setQsid(String qsid) {

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

@@ -61 +61 @@
          */     
         public URL getScanRepositoryURL() throws MalformedURLException {                
-                URL url = new URL(Repositories.getRepositories().getRepositoryPath(getSourceAction().getRepository()) + "?operation=scan&scanClause=fcs.resource" );            
+                URL url = new URL(Repositories.getRepositories().getRepositoryPath(getSourceAction().getRepository()) + "?operation=" + getParam("operation") + "&scanClause=" + getParam("scanClause") );              
                 return url;
         }