SF.net SVN: ledger-smb:[6361] trunk

[..hidden..]

Revision: 6361
          http://sourceforge.net/p/ledger-smb/code/6361
Author:   einhverfr
Date:     2014-01-03 09:16:31 +0000 (Fri, 03 Jan 2014)
Log Message:
-----------
Templates now loading through load script

Modified Paths:
--------------
    trunk/sql/modules/Templates.sql
    trunk/tools/load_templates.pl

Modified: trunk/sql/modules/Templates.sql
===================================================================
--- trunk/sql/modules/Templates.sql	2014-01-03 09:03:50 UTC (rev 6360)
+++ trunk/sql/modules/Templates.sql	2014-01-03 09:16:31 UTC (rev 6361)
@@ -36,13 +36,13 @@
           language_code IS NOT DISTINCT FROM in_language_code;
           
    IF FOUND THEN
-      retval := template_get(in_template_name, in_language_code, in_format);
+      retval := template__get(in_template_name, in_language_code, in_format);
       RETURN retval;
    END IF;
    INSERT INTO template (template_name, language_code, template, format)
-   VALUES (in_template_name, language_code, template, in_format);
+   VALUES (in_template_name, in_language_code, in_template, in_format);
 
-   retval := template_get(in_template_name, in_language_code, in_format);
+   retval := template__get(in_template_name, in_language_code, in_format);
    RETURN retval;
 END;
 $$;

Modified: trunk/tools/load_templates.pl
===================================================================
--- trunk/tools/load_templates.pl	2014-01-03 09:03:50 UTC (rev 6360)
+++ trunk/tools/load_templates.pl	2014-01-03 09:16:31 UTC (rev 6361)
@@ -69,8 +69,9 @@
     if ($path =~ m|/.*:| ){
        die 'Cannot run on NTFS alternate data stream!';
     }
-    $fname =~ s|.*/?([^/]+)|$1|;
-    my ($template_name, $format) = split /./, $fname;
+    $path =~ m|(.*)/([^/]+)$|;
+    $fname = $2;
+    my ($template_name, $format) = split /\./, $fname;
     my $content = '';
     open TEMP, '<', $path;
     $content .= $_ while <TEMP>;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


------------------------------------------------------------------------------
Rapidly troubleshoot problems before they affect your business. Most IT 
organizations don't have a clear picture of how application performance 
affects their revenue. With AppDynamics, you get 100% visibility into your 
Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk
_______________________________________________
Ledger-smb-commits mailing list
..hidden..
https://lists.sourceforge.net/lists/listinfo/ledger-smb-commits