Changeset 1650

Timestamp:

12/09/11 20:39:49 (12 years ago)

Author:

vronk

Message:

correcting config-usage
+ started implementing of listTerms

Location:

SMC/trunk/SMC/src

Files:

• eu/clarin/cmdi/smc/SMC.java (modified) (10 diffs)
• scripts/smc_op.xsl (modified) (2 diffs)
• scripts/smc_stats.xsl (modified) (1 diff)
• smc.properties (modified) (1 diff)

SMC/trunk/SMC/src/eu/clarin/cmdi/smc/SMC.java

@@ -32 +32 @@
  */
 public class SMC {
+        private static String appname="smc"; 
         
         public SMC () {
@@ -49 +50 @@
                         
                 SMC smc = new SMC();
-                smc.init();             
+
+                //smc.init();           
                 
                 InputStream is = smc.listTermsets("");
@@ -59 +61 @@
 
         public void configure(){
-                Utils.loadConfig("smc", "smc.properties", this.getClass().getClassLoader());
+                Utils.loadConfig(appname, "smc.properties", this.getClass().getClassLoader());
         }
         public void configure(String configPath) {
                 try {
-                        Utils.loadConfig("smc", configPath, this.getClass().getClassLoader());
+                        Utils.loadConfig(appname, configPath, this.getClass().getClassLoader());
                         
                         //config = new PropertiesConfiguration("smc.properties");
@@ -76 +78 @@
  */
         public void init () {
- 
+                 
                 InputStream is =null;
                 is = Utils.load2Stream(Utils.getConfig("termsets.config.file"),this.getClass().getClassLoader());
@@ -83 +85 @@
                 
                 MDTransformer transformer = new MDTransformer();
-                //transformer.configure(config, this.getClass().getClassLoader());
+                transformer.configure(Utils.getAppConfig(appname), this.getClass().getClassLoader());
+                
                 // set URL as srcFile (for MDTransformer to pass to xsl-scripts)
                 // TODO: WHY??
@@ -90 +93 @@
 
                 // this is necessary for the transformer (in MDUTILS-library) to search for the resources (config and xsls) in the correct context)
-                transformer.configure(Utils.getConfig(), this.getClass().getClassLoader());
+                //transformer.configure(Utils.getConfig(), this.getClass().getClassLoader());
                 
                 transformer.setParams(getParams());             
@@ -103 +106 @@
                         //String output_path = config.getString("cache.dir") +  getParam("data_key") + ".xml" ;
                         File f = Utils.write2File(output_path, resultStream);
-                        log.debug("result stored in: " + f.getAbsolutePath());
+                        log.debug("SMC.init(): result stored in: " + f.getAbsolutePath());
 
                 } catch (IOException e1) {
@@ -195 +198 @@
          * @return stream with XML listing the available termsets
          */
-        public InputStream listTermsets(String context) {
+        public InputStream listTermsets(String context) {               
                 InputStream is =null;
                 is = Utils.load2Stream(Utils.getConfig("termsets.config.file").trim(), this.getClass().getClassLoader());
@@ -207 +210 @@
          */     
         public InputStream listTerms(String context) {
-                return null;
+                 
+                InputStream is =null;
+                is = Utils.load2Stream(Utils.getConfig("termsets.config.file"),this.getClass().getClassLoader());
+                
+                MDTransformer transformer = new MDTransformer();
+                // this is necessary for the transformer (in MDUTILS-library) to search for the resources (config and xsls) in the correct context)
+                transformer.configure(Utils.getAppConfig(appname), this.getClass().getClassLoader());
+                
+                // set URL as srcFile (for MDTransformer to pass to xsl-scripts)
+                // TODO: WHY??
+                //transformer.setSrcFile(Utils.getConfig("termsets.config.file"));
+                
+                addParam("set", context);
+                 
+                transformer.setParams(getParams());             
+                transformer.setTranskey("op");
+
+                InputStream resultStream=null;
+                try {
+                        resultStream = transformer.transformXML(is);
+
+                } catch (IOException e1) {
+                        log.debug(Utils.errorMessage(e1));
+                } catch (InterruptedException e1) {
+                        log.debug(Utils.errorMessage(e1));
+                } catch (TransformerException e1) {             
+                        log.debug(Utils.errorMessage(e1));
+                } catch (NoStylesheetException e1) {
+                        log.debug(Utils.errorMessage(e1));
+                }
+                
+                return resultStream;
         }
         
@@ -216 +250 @@
          */
         public InputStream map(String term) {
-                return null;
+                 
+                InputStream is =null;
+                is = Utils.load2Stream(Utils.getConfig("termsets.config.file"),this.getClass().getClassLoader());
+                
+                MDTransformer transformer = new MDTransformer();
+                // this is necessary for the transformer (in MDUTILS-library) to search for the resources (config and xsls) in the correct context)
+                transformer.configure(Utils.getAppConfig(appname), this.getClass().getClassLoader());
+                
+                // set URL as srcFile (for MDTransformer to pass to xsl-scripts)
+                // TODO: WHY??
+                //transformer.setSrcFile(Utils.getConfig("termsets.config.file"));
+                
+                addParam("term", term);
+                 
+                transformer.setParams(getParams());             
+                transformer.setTranskey("op");
+
+                InputStream resultStream=null;
+                try {
+                        resultStream = transformer.transformXML(is);
+
+                } catch (IOException e1) {
+                        log.debug(Utils.errorMessage(e1));
+                } catch (InterruptedException e1) {
+                        log.debug(Utils.errorMessage(e1));
+                } catch (TransformerException e1) {             
+                        log.debug(Utils.errorMessage(e1));
+                } catch (NoStylesheetException e1) {
+                        log.debug(Utils.errorMessage(e1));
+                }
+                
+                return resultStream;
         }
         

SMC/trunk/SMC/src/scripts/smc_op.xsl

@@ -18 +18 @@
     
  <xsl:template match="/">
-     <xsl:choose>
-         <!-- if $term=*, list all terms -->
+     <xsl:choose>     
+     <!-- if $set=*, list all termsets -->
          <xsl:when test="$set='*' or $set='top'">
                 <xsl:copy-of select="my:getData('termsets')"></xsl:copy-of>             
-         </xsl:when>         
+         </xsl:when>
+             <!-- if $term=*, list all terms -->         
          <xsl:when test="$term='*'">
              <Termset set="{$set}" xml:lang="{$lang}">
@@ -36 +37 @@
              </xsl:for-each>
          </xsl:otherwise>
-     </xsl:choose>
-     
+     </xsl:choose>     
      
  </xsl:template>

SMC/trunk/SMC/src/scripts/smc_stats.xsl

@@ -27 +27 @@
 -->
  
-<xsl:import href="cmd_commons.xsl"/>
+<!--<xsl:import href="cmd_commons.xsl"/>-->
     
 <xsl:output method="xml" indent="yes" />

SMC/trunk/SMC/src/smc.properties

@@ -1 +1 @@
 termsets.config.file = smc_config.xml
-#cache.dir = C:/Users/m/3lingua/clarin/CMDI/SMC/cache/
-cache.dir = C:/apache-tomcat-6.0.26/webapps/SMC_cache/
+cache.dir = C:/Users/m/3lingua/clarin/CMDI/SMC/cache/
+#cache.dir = C:/apache-tomcat-6.0.26/webapps/SMC_cache/
 
 scripts.path = scripts/
 xsl.init = smc_init.xsl
+xsl.map = smc_op.xsl