Changeset 1663 for MDService2

Timestamp:

12/12/11 23:25:20 (12 years ago)

Author:

gaba

Message:

transformer configuration corrections

Location:

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

Files:

• action/GenericAction.java (modified) (3 diffs)
• action/VirtualCollectionProxyAction.java (modified) (1 diff)
• action/WorkspaceAction.java (modified) (1 diff)
• model/Query.java (modified) (2 diffs)
• model/WorkspaceProfile.java (modified) (2 diffs)
• proxy/RepoProxy.java (modified) (2 diffs)

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

@@ -3 +3 @@
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URL;
 import java.net.URLConnection;
 import java.util.HashMap;
@@ -273 +274 @@
          */
         public InputStream getSourceStream() throws IOException, NoStylesheetException, CQLParseException {             
-                        return getTargetProxy().getSourceStream(); 
+                        
+                return getTargetProxy().getSourceStream(); 
+                
         }
                 
@@ -568 +571 @@
                         
                         //Caching
-                
                         if (getCache().equals(Cache.SKIP)) {
-                                
                                 sourceStream = getSourceStream();
-                                
                         } else { 
                                 if (getCache().equals(Cache.USE)) {

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

@@ -80 +80 @@
                 //xslt transform to request data
                 MDTransformer transformer = new MDTransformer();
+                transformer.configure(Utils.getAppConfig("mdservice"), this.getClass().getClassLoader());
                 transformer.setSrcFile(this.getTargetProxy().getTargetRequest());
                 transformer.setParams(getParams());

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

@@ -886 +886 @@
                         // set srcFile (for MDTransformer to pass to xsl-scripts) 
                         MDTransformer transformer = new MDTransformer();
+                        transformer.configure(Utils.getAppConfig("mdservice"), this.getClass().getClassLoader());
                         transformer.setSrcFile(getURL());
                         transformer.setParams(getParams());

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

@@ -70 +70 @@
                 String[] sarr = new String[1];
                 sarr[0] = "1";
-                put("startItem", sarr); 
+                put("startRecord", sarr);       
                 sarr = new String[1];
                 sarr[0] = "50";
-                put("maximumItems", sarr);      
+                put("maximumRecords", sarr);    
                 sarr = new String[1];
                 sarr[0] = "Id,name";
@@ -553 +553 @@
         public String toXPath() {       
                 MDTransformer transformer = new MDTransformer();
+                transformer.configure(Utils.getAppConfig("mdservice"), this.getClass().getClassLoader());
                 transformer.setParams(MDTransformer.createParamsMap("XCQL2XPATH"));
                 try {

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

@@ -263 +263 @@
                 
                 MDTransformer transformer = new MDTransformer();
+                transformer.configure(Utils.getAppConfig("mdservice"), WorkspaceProfile.class.getClassLoader());
                 transformer.setSrcFile(file.toURI().toURL());
                 transformer.setParams(MDTransformer.createParamsMap("xml2json"));
@@ -315 +316 @@
                 
                 MDTransformer transformer = new MDTransformer();
+                transformer.configure(Utils.getAppConfig("mdservice"), WorkspaceProfile.class.getClassLoader());
                 transformer.setSrcFile(file.toURI().toURL());
                 transformer.setParams(MDTransformer.createParamsMap("xml2json"));

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

@@ -5 +5 @@
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.net.URLConnection;
 import java.util.Map;
 
@@ -132 +133 @@
         
         public InputStream getSourceStream() throws IOException, NoStylesheetException, CQLParseException {
+                
                 return getTargetRequest().openStream();         
         }