Changeset 1488 for MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action/GenericProxyAction.java

Timestamp:

08/21/11 20:31:13 (13 years ago)

Author:

vronk

Message:

output - method, DOCTYPE, encoding issues (trying to unify for xhtml (but not over all xsls yet); test-suite update

File:

• MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action/GenericProxyAction.java (modified) (7 diffs)

MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/action/GenericProxyAction.java

@@ -93 +93 @@
                                 // TODO Auto-generated catch block
                                 e.printStackTrace();
+                        } catch (NoStylesheetException e) {
+                                // TODO Auto-generated catch block
+                                e.printStackTrace();
                         }
          }
@@ -196 +199 @@
         public String getActionContentType() {
                 if (format.toLowerCase().startsWith("html")) {
-                        this.actionContentType = "text/html";
+                        this.actionContentType = "text/html";           
+                        //this.actionContentType = "application/xhtml+xml";
                 } else {
                         this.actionContentType = "text/xml";
@@ -408 +412 @@
                         return key;
         }
-        public InputStream getSourceStream() throws IOException {               
+        public InputStream getSourceStream() throws IOException, NoStylesheetException {                
                 return getTargetRequest().openStream();
                 //      Admin.notifyUser(getProxyKey() + ".getSourceStream() - unable to open stream: " + getTargetRequest();  
@@ -446 +450 @@
 
         
-        public static JSONArray createRepositories() throws IOException, InterruptedException, TransformerException{
+        public static JSONArray createRepositories() throws IOException, InterruptedException, TransformerException, NoStylesheetException{
                 String path = Admin.getConfig().getProperty("workspaceprofile.path") + WorkspaceAction.WORKSPACE_FILENAME;//PROFILENAME_SERVER;
                 File file=new File(path);
@@ -452 +456 @@
                 
                 MDTransformer transformer = new MDTransformer();
-                transformer.setSrcFile(file.toURL());
+                transformer.setSrcFile(file.toURI().toURL());
                 transformer.setParams(MDTransformer.createParamsMap("xml2json"));
                 InputStream jsonstream = transformer.transformXML(in);
@@ -497 +501 @@
                                 // TODO Auto-generated catch block
                                 e.printStackTrace();
+                        } catch (NoStylesheetException e) {
+                                // TODO Auto-generated catch block
+                                e.printStackTrace();
                         }
                 }
@@ -536 +543 @@
                                 e.printStackTrace();
                         } catch (TransformerException e) {
+                                // TODO Auto-generated catch block
+                                e.printStackTrace();
+                        } catch (NoStylesheetException e) {
                                 // TODO Auto-generated catch block
                                 e.printStackTrace();