Changeset 911

Timestamp:

11/18/10 11:42:02 (14 years ago)

Author:

gaba

Message:

 

Location:

MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice

Files:

• action/CompRegistryProxyAction.java (modified) (2 diffs)
• action/GenericProxyAction.java (modified) (2 diffs)
• action/GenericWorkspaceAction.java (modified) (1 diff)
• action/MDTransformer.java (modified) (3 diffs)
• action/TermsProxyAction.java (modified) (1 diff)
• action/WorkspaceAction.java (modified) (1 diff)
• model/Query.java (modified) (1 diff)
• model/Result.java (modified) (1 diff)

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

@@ -136 +136 @@
                                         Admin.notifyUser("CCCRPA." + getTargetRequest());
                                         Admin.notifyUser("CCCRPA." + getFullFormat());
-                                        MDTransformer.getMDTransformer().setSrcFile(getTargetRequest());
-                                        MDTransformer.getMDTransformer().setParams(createTransformerParams());
-                                        _sourceStream = MDTransformer.getMDTransformer().transformXML(__sourceStream);//, getFullFormat(),null,null,null,null,null,null);
+                                        MDTransformer transformer = new MDTransformer();
+                                        transformer.setSrcFile(getTargetRequest());
+                                        transformer.setParams(createTransformerParams());
+                                        _sourceStream = transformer.transformXML(__sourceStream);//, getFullFormat(),null,null,null,null,null,null);
                                         Admin.notifyUser("CRPA.- elements");
                                         setActionkey("elements");
@@ -163 +164 @@
                         }else {
                                 // set URL as srcFile (for MDTransformer to pass to xsl-scripts) 
-                                MDTransformer.getMDTransformer().setSrcFile(getTargetRequest());
-                                MDTransformer.getMDTransformer().setParams(MDTransformer.createParamsMap(getFullFormat()));
-                                _resultStream = MDTransformer.getMDTransformer().transformXML(_sourceStream);//, getFullFormat());
+                                MDTransformer transformer = new MDTransformer();
+                                transformer.setSrcFile(getTargetRequest());
+                                transformer.setParams(MDTransformer.createParamsMap(getFullFormat()));
+                                _resultStream = transformer.transformXML(_sourceStream);//, getFullFormat());
                                         
                         }

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

@@ -384 +384 @@
                 InputStream in  = new BufferedInputStream( new FileInputStream(path));;
                 
-                MDTransformer.getMDTransformer().setSrcFile(file.toURL());
-                MDTransformer.getMDTransformer().setParams(MDTransformer.createParamsMap("xml2json"));
-                InputStream jsonstream = MDTransformer.getMDTransformer().transformXML(in);
+                MDTransformer transformer = new MDTransformer();
+                transformer.setSrcFile(file.toURL());
+                transformer.setParams(MDTransformer.createParamsMap("xml2json"));
+                InputStream jsonstream = transformer.transformXML(in);
                 
                 JSONObject json = JSONObject.fromObject(convertStreamToString(jsonstream));
@@ -526 +527 @@
                         resultStream = sourceStream;    
                 }else {
-                        // set URL as srcFile (for MDTransformer to pass to xsl-scripts) 
-                        MDTransformer.getMDTransformer().setSrcFile(getTargetRequest());
+                        // set URL as srcFile (for MDTransformer to pass to xsl-scripts)
+                        MDTransformer transformer = new MDTransformer();
+                        transformer.setSrcFile(getTargetRequest());
                         // getColumns
                         Admin.notifyUser("GPA.getRepository, before xsl:" + getRepository());
-                        MDTransformer.getMDTransformer().setParams(createTransformerParams());
-                        resultStream = MDTransformer.getMDTransformer().transformXML(sourceStream);//, getFullFormat(), getColumns(), getStartRecord(), getMaximumRecords(),getLang(),getQ(),String.valueOf(getRepository()));
+                        transformer.setParams(createTransformerParams());
+                        resultStream = transformer.transformXML(sourceStream);//, getFullFormat(), getColumns(), getStartRecord(), getMaximumRecords(),getLang(),getQ(),String.valueOf(getRepository()));
                 }
                         

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

@@ -179 +179 @@
                 }else { //JSON
                         // set srcFile (for MDTransformer to pass to xsl-scripts) 
-                        MDTransformer.getMDTransformer().setSrcFile(getURL());
+                        MDTransformer transformer = new MDTransformer();
+                        transformer.setSrcFile(getURL());
                         //InputStream tmp_s =  MDTransformer.getMDTransformer().transformXML(sourceStream, "attr2elements");
-                        MDTransformer.getMDTransformer().setParams(MDTransformer.createParamsMap(getFullFormat()));
-                        InputStream s =  MDTransformer.getMDTransformer().transformXML(sourceStream);//, getFullFormat());
+                        transformer.setParams(MDTransformer.createParamsMap(getFullFormat()));
+                        InputStream s =  transformer.transformXML(sourceStream);//, getFullFormat());
                         resultStream = getPart(s);
                 }

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

@@ -53 +53 @@
         private HashMap<String,String> params;
                 
-        private static MDTransformer singleton;
+        private MDTransformer singleton;
         TransformerFactory tfactory ; 
         
@@ -60 +60 @@
         }
         
+        /*
         public static MDTransformer getMDTransformer () {
                 if (singleton == null) {
@@ -66 +67 @@
                 return singleton;
         }
-        
+        */
         
         public URL getSrcFile() {

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

@@ -131 +131 @@
                         InputStream resultStream=null;
                         try {
-                                MDTransformer.getMDTransformer().setParams(createTransformerParams());
-                                resultStream = MDTransformer.getMDTransformer().transformXML(stream_matrix_all);//, "terms2extract", getColumns(), getStartRecord(), getMaximumRecords(),getLang(),getQ(), getRepositoryPath());
+                                MDTransformer transformer = new MDTransformer();
+                                transformer.setParams(createTransformerParams());
+                                resultStream = transformer.transformXML(stream_matrix_all);//, "terms2extract", getColumns(), getStartRecord(), getMaximumRecords(),getLang(),getQ(), getRepositoryPath());
                         } catch (InterruptedException e) {                              
                                 Admin.notifyUser("TPA.getSourceStream(): "+ e.getMessage());

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

@@ -272 +272 @@
                 }else { //JSON
                         // set srcFile (for MDTransformer to pass to xsl-scripts) 
-                        MDTransformer.getMDTransformer().setSrcFile(getURL());
-                        MDTransformer.getMDTransformer().setParams(MDTransformer.createParamsMap(getFullFormat()));
-                        setResultStream(MDTransformer.getMDTransformer().transformXML(in));//, getFullFormat()));
+                        MDTransformer transformer = new MDTransformer();
+                        transformer.setSrcFile(getURL());
+                        transformer.setParams(MDTransformer.createParamsMap(getFullFormat()));
+                        setResultStream(transformer.transformXML(in));//, getFullFormat()));
                         //setSessionData(getResultStream());
                 }

MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/model/Query.java

@@ -393 +393 @@
          */
         public String toXPath() {       
-                MDTransformer.getMDTransformer().setParams(MDTransformer.createParamsMap("XCQL2XPATH"));
-                return MDTransformer.getMDTransformer().transformXML(toXCQL());
+                MDTransformer transformer = new MDTransformer();
+                transformer.setParams(MDTransformer.createParamsMap("XCQL2XPATH"));
+                return transformer.transformXML(toXCQL());
         }
 

MDService2/trunk/MDService2/src/eu/clarin/cmdi/mdservice/model/Result.java

@@ -58 +58 @@
                         transformkey = parentQuery.getType() + "2" + format;
                         Admin.notifyUser("transformkey: " + transformkey );
-                        MDTransformer.getMDTransformer().setParams(MDTransformer.createParamsMap(transformkey));
-                        return MDTransformer.getMDTransformer().transformXML(rawresult);//, transformkey);
+                        MDTransformer transformer = new MDTransformer();
+                        transformer.setParams(MDTransformer.createParamsMap(transformkey));
+                        return transformer.transformXML(rawresult);//, transformkey);
                 }       
         }