Changeset 2437 for SMC

Timestamp:

01/02/13 16:30:06 (11 years ago)

Author:

vronk

Message:

renamed folder scripts to xsl
(to distinguish better from web "scripts": js, css)

Location:

SMC/trunk/SMC/src/xsl

Files:

• . (copied) (copied from SMC/trunk/SMC/src/scripts)
• cmd_includes.xsl (copied) (copied from SMC/trunk/SMC/src/scripts/cmd_includes.xsl)
• dcr_rdf2terms.xsl (copied) (copied from SMC/trunk/SMC/src/scripts/dcr_rdf2terms.xsl)
• dcr_smc2skos.xsl (copied) (copied from SMC/trunk/SMC/src/scripts/dcr_smc2skos.xsl)
• smc_commons.xsl (copied) (copied from SMC/trunk/SMC/src/scripts/smc_commons.xsl) (1 diff)
• smc_functions.xsl (copied) (copied from SMC/trunk/SMC/src/scripts/smc_functions.xsl)
• smc_init.xsl (copied) (copied from SMC/trunk/SMC/src/scripts/smc_init.xsl) (1 diff)
• smc_op.xsl (copied) (copied from SMC/trunk/SMC/src/scripts/smc_op.xsl)
• smc_params.xsl (copied) (copied from SMC/trunk/SMC/src/scripts/smc_params.xsl) (1 diff)
• smc_stats.xsl (copied) (copied from SMC/trunk/SMC/src/scripts/smc_stats.xsl)

SMC/trunk/SMC/src/xsl/smc_commons.xsl

@@ -44 +44 @@
         <xsl:param name="cache"></xsl:param>
         
-        <xsl:variable name="cached_data_file" select="concat($cache_dir, $key, '.xml')"></xsl:variable>
-        <xsl:message>
-            cache: <xsl:value-of select="$cache" /> -
-            <xsl:value-of select="$cached_data_file" />: <xsl:value-of select="doc-available($cached_data_file)" />
-        </xsl:message>
+      <xsl:variable name="cached_data_file" select="concat($cache_dir, if (ends-with($cache_dir,'/') or ends-with($cache_dir,'\')) then '' else '/',
+                                                            $key, '.xml')"></xsl:variable>
+                <xsl:message>cache: <xsl:value-of select="$cache" /></xsl:message>
+                <xsl:message><xsl:value-of select="$cached_data_file" /> available <xsl:value-of select="doc-available($cached_data_file)" /></xsl:message>
         <xsl:choose>
             <xsl:when test="doc-available($cached_data_file) and $cache='use'">

SMC/trunk/SMC/src/xsl/smc_init.xsl

@@ -50 +50 @@
   </xd:desc>
  </xd:doc>
-<xsl:template match="/" > 
+<xsl:template match="/" >
+<xsl:message>cache dir: <xsl:value-of select="$cache_dir"></xsl:value-of></xsl:message> 
  <xsl:copy-of select="my:getData($data_key,$cache)" exclude-result-prefixes="my"></xsl:copy-of>
 </xsl:template>                 

SMC/trunk/SMC/src/xsl/smc_params.xsl

@@ -17 +17 @@
     <xsl:param name="default_lang" select="'en'" />
 <!--    <xsl:param name="cache_dir" select="'file:/C:/Users/m/3lingua/clarin/CMDI/SMC/cache/'" />-->
-    <xsl:variable name="cache_dir" select="'file:/C:/Users/m/3lingua/clarin/CMDI/_repo2/SMC/data/'" />    
+    <xsl:param name="cache_dir" select="'file:/C:/Users/m/3lingua/clarin/CMDI/_repo2/SMC/data/'" />    
 </xsl:stylesheet>