r63145 - in /branches/upstream/libhtml-template-pro-perl/current: ./ lib/HTML/Template/ t/ templates-Pro/

periapt-guest at users.alioth.debian.org periapt-guest at users.alioth.debian.org
Fri Oct 1 14:37:21 UTC 2010


Author: periapt-guest
Date: Fri Oct  1 14:37:04 2010
New Revision: 63145

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=63145
Log:
[svn-upgrade] new version libhtml-template-pro-perl (0.9504)

Added:
    branches/upstream/libhtml-template-pro-perl/current/t/htp_version.t
Modified:
    branches/upstream/libhtml-template-pro-perl/current/Changes
    branches/upstream/libhtml-template-pro-perl/current/MANIFEST
    branches/upstream/libhtml-template-pro-perl/current/META.yml
    branches/upstream/libhtml-template-pro-perl/current/Makefile.PL
    branches/upstream/libhtml-template-pro-perl/current/README
    branches/upstream/libhtml-template-pro-perl/current/exprpstr.inc
    branches/upstream/libhtml-template-pro-perl/current/lib/HTML/Template/PerlInterface.pod
    branches/upstream/libhtml-template-pro-perl/current/lib/HTML/Template/Pro.pm
    branches/upstream/libhtml-template-pro-perl/current/lib/HTML/Template/SYNTAX.pod
    branches/upstream/libhtml-template-pro-perl/current/perl-HTML-Template-Pro.spec
    branches/upstream/libhtml-template-pro-perl/current/t/HTML-Template-Expr.t
    branches/upstream/libhtml-template-pro-perl/current/templates-Pro/test_expr5.out
    branches/upstream/libhtml-template-pro-perl/current/templates-Pro/test_expr5.tmpl
    branches/upstream/libhtml-template-pro-perl/current/tmplpro_version.c

Modified: branches/upstream/libhtml-template-pro-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libhtml-template-pro-perl/current/Changes?rev=63145&op=diff
==============================================================================
--- branches/upstream/libhtml-template-pro-perl/current/Changes (original)
+++ branches/upstream/libhtml-template-pro-perl/current/Changes Fri Oct  1 14:37:04 2010
@@ -299,3 +299,7 @@
 	- freed memory access error fixed.
 	- perl: CommonTest.pm hidden from installation
 	- tests: added generic json-packed test data 
+
+09504 Tue Sep 28 17:16:55 EEST 2010
+	- bugfix in string comparision
+	- spelling fix by gregor herrmann <gregoa at debian.org>

Modified: branches/upstream/libhtml-template-pro-perl/current/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libhtml-template-pro-perl/current/MANIFEST?rev=63145&op=diff
==============================================================================
--- branches/upstream/libhtml-template-pro-perl/current/MANIFEST (original)
+++ branches/upstream/libhtml-template-pro-perl/current/MANIFEST Fri Oct  1 14:37:04 2010
@@ -69,6 +69,7 @@
 t/HTML-Template-Pro.t
 t/HTML-Template.t
 t/HTML/Template/Pro/CommonTest.pm
+t/htp_version.t
 t/magic.t
 t/pod.t
 t/realloc.t

Modified: branches/upstream/libhtml-template-pro-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libhtml-template-pro-perl/current/META.yml?rev=63145&op=diff
==============================================================================
--- branches/upstream/libhtml-template-pro-perl/current/META.yml (original)
+++ branches/upstream/libhtml-template-pro-perl/current/META.yml Fri Oct  1 14:37:04 2010
@@ -1,6 +1,6 @@
 --- #YAML:1.0
 name:               HTML-Template-Pro
-version:            0.9503
+version:            0.9504
 abstract:           Perl/XS module to use HTML Templates from CGI scripts
 author:
     - I. Yu. Vlasenko <viy at altlinux.org>

Modified: branches/upstream/libhtml-template-pro-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libhtml-template-pro-perl/current/Makefile.PL?rev=63145&op=diff
==============================================================================
--- branches/upstream/libhtml-template-pro-perl/current/Makefile.PL (original)
+++ branches/upstream/libhtml-template-pro-perl/current/Makefile.PL Fri Oct  1 14:37:04 2010
@@ -9,6 +9,8 @@
 
 my ($INC, $DEFINE, $LIBS, $O_FILES, $STATIC_BUILD);
 
+our $VERSION='';
+eval `grep 'VERSION *=' lib/HTML/Template/Pro.pm`;
 
 if (grep {/^DYNAMIC=1/} @ARGV) {
     $STATIC_BUILD=0;
@@ -31,6 +33,8 @@
     MMAP  => 1,
     IMITATE=>0,
 );
+$DEF{PACKAGE_VERSION}=$VERSION if $VERSION;
+
 
 &configure() if $STATIC_BUILD;
 

Modified: branches/upstream/libhtml-template-pro-perl/current/README
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libhtml-template-pro-perl/current/README?rev=63145&op=diff
==============================================================================
--- branches/upstream/libhtml-template-pro-perl/current/README (original)
+++ branches/upstream/libhtml-template-pro-perl/current/README Fri Oct  1 14:37:04 2010
@@ -1,4 +1,4 @@
-HTML-Template-Pro version 0.9503
+HTML-Template-Pro version 0.9504
 ==============================
 
 DESCRIPTION

Modified: branches/upstream/libhtml-template-pro-perl/current/exprpstr.inc
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libhtml-template-pro-perl/current/exprpstr.inc?rev=63145&op=diff
==============================================================================
--- branches/upstream/libhtml-template-pro-perl/current/exprpstr.inc (original)
+++ branches/upstream/libhtml-template-pro-perl/current/exprpstr.inc Fri Oct  1 14:37:04 2010
@@ -86,6 +86,7 @@
   const char* in_a=a.begin;
   const char* in_b=b.begin;
   if (in_a==NULL || in_b==NULL) return in_a == in_b;
+  if (in_a==a.endnext) return in_b==b.endnext;
   while (in_a<a.endnext && in_b < b.endnext && *in_a++==*in_b++);
   if (in_a==a.endnext && in_b==b.endnext && *(--in_a) == *(--in_b)) return 1; else return 0;
 }

Modified: branches/upstream/libhtml-template-pro-perl/current/lib/HTML/Template/PerlInterface.pod
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libhtml-template-pro-perl/current/lib/HTML/Template/PerlInterface.pod?rev=63145&op=diff
==============================================================================
--- branches/upstream/libhtml-template-pro-perl/current/lib/HTML/Template/PerlInterface.pod (original)
+++ branches/upstream/libhtml-template-pro-perl/current/lib/HTML/Template/PerlInterface.pod Fri Oct  1 14:37:04 2010
@@ -386,7 +386,7 @@
 keys in every hash it will find in "param" tree, which is sometimes 
 an expensive operation. To avoid this, set case_sensitive => 1.
 
-If case conversion is nessessary, there is an alternative lightweight 
+If case conversion is necessary, there is an alternative lightweight
 option tmpl_var_case, which is HTML::Template::Pro specific.
 
 Note that case_sensitive is wrapper-only option: it is not implemented 
@@ -540,7 +540,7 @@
 template tags.
 
 In the most simple usage, you simply assign a code reference to the
-filter parameter.  This subroutine will recieve a single argument - a
+filter parameter.  This subroutine will receive a single argument - a
 reference to a string containing the template file text.  Here is an
 example that accepts templates with tags that look like "!!!ZAP_VAR
 FOO!!!" and transforms them into HTML::Template tags:
@@ -630,7 +630,7 @@
       $self->param(PARAM => 'value');
 
       # with a subroutine reference that gets called to get the value
-      # of the scalar.  The sub will recieve the template object as a
+      # of the scalar.  The sub will receive the template object as a
       # parameter.
       $self->param(PARAM => sub { return 'value' });   
 
@@ -902,7 +902,7 @@
   HTML::Template::Expr->register_function(func_name => \&func_handler);
 
 You provide a subroutine reference that will be called during output.
-It will recieve as arguments the parameters specified in the template.
+It will receive as arguments the parameters specified in the template.
 For example, here's a function that checks if a directory exists:
 
   sub directory_exists {
@@ -982,7 +982,7 @@
 option to be set, whereas currently HTML::Template::Expr does.
 Anyway, this also will hopefully go away in a future version of 
 HTML::Template::Expr, so if you need global_vars in your templates 
-then you should set it explicitely.
+then you should set it explicitly.
 
 
 

Modified: branches/upstream/libhtml-template-pro-perl/current/lib/HTML/Template/Pro.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libhtml-template-pro-perl/current/lib/HTML/Template/Pro.pm?rev=63145&op=diff
==============================================================================
--- branches/upstream/libhtml-template-pro-perl/current/lib/HTML/Template/Pro.pm (original)
+++ branches/upstream/libhtml-template-pro-perl/current/lib/HTML/Template/Pro.pm Fri Oct  1 14:37:04 2010
@@ -12,7 +12,7 @@
 use vars qw($VERSION @ISA @EXPORT_OK %EXPORT_TAGS);
 @ISA = qw(DynaLoader Exporter);
 
-$VERSION = '0.9503';
+$VERSION = '0.9504';
 
 @EXPORT_OK = qw/ASK_NAME_DEFAULT ASK_NAME_AS_IS ASK_NAME_LOWERCASE ASK_NAME_UPPERCASE ASK_NAME_MASK/;
 %EXPORT_TAGS = (const => [qw/ASK_NAME_DEFAULT ASK_NAME_AS_IS ASK_NAME_LOWERCASE ASK_NAME_UPPERCASE ASK_NAME_MASK/]);
@@ -462,7 +462,7 @@
 of HTML::Template (as of 2.9) and HTML::Template::Expr (as of 0.0.7). 
 It is not intended to be a complete replacement, 
 but to be a fast implementation of HTML::Template if you don't need 
-quering, the extended facility of HTML::Template.
+querying, the extended facility of HTML::Template.
 Designed for heavy upload, resource limitations, abcence of mod_perl.
 
 HTML::Template::Pro has complete support of filters and HTML::Template::Expr's 

Modified: branches/upstream/libhtml-template-pro-perl/current/lib/HTML/Template/SYNTAX.pod
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libhtml-template-pro-perl/current/lib/HTML/Template/SYNTAX.pod?rev=63145&op=diff
==============================================================================
--- branches/upstream/libhtml-template-pro-perl/current/lib/HTML/Template/SYNTAX.pod (original)
+++ branches/upstream/libhtml-template-pro-perl/current/lib/HTML/Template/SYNTAX.pod Fri Oct  1 14:37:04 2010
@@ -282,7 +282,7 @@
 directly.  See below for more information on HTML_TEMPLATE_ROOT and
 the "path" option to new().
 
-As a protection against infinitly recursive includes, an arbitary
+As a protection against infinitly recursive includes, an arbitrary
 limit of 10 levels deep is imposed.  You can alter this limit with the
 "max_includes" option.  See the entry for the "max_includes" option
 below for more details.
@@ -607,7 +607,7 @@
 HTML::Template::Pro by Stanislav Yadykin <tosick at altlinux.ru>.
 Currently it is not included in official distribution of HTML::Template::Expr.
 
-Standart regexp syntax:
+Standard regexp syntax:
 
 =over 4
 

Modified: branches/upstream/libhtml-template-pro-perl/current/perl-HTML-Template-Pro.spec
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libhtml-template-pro-perl/current/perl-HTML-Template-Pro.spec?rev=63145&op=diff
==============================================================================
--- branches/upstream/libhtml-template-pro-perl/current/perl-HTML-Template-Pro.spec (original)
+++ branches/upstream/libhtml-template-pro-perl/current/perl-HTML-Template-Pro.spec Fri Oct  1 14:37:04 2010
@@ -6,7 +6,7 @@
 %define module HTML-Template-Pro
 
 Name: perl-%module
-Version: 0.9503
+Version: 0.9504
 Release: alt1
 
 Packager: Igor Yu. Vlasenko <viy at altlinux.org>
@@ -54,6 +54,9 @@
 %perl_vendor_man3dir/*
 
 %changelog
+* Tue Sep 28 2010 Igor Vlasenko <viy at altlinux.ru> 0.9504-alt1
+- new version; see Changes
+
 * Sat Aug 28 2010 Igor Vlasenko <viy at altlinux.ru> 0.9503-alt1
 - new version; see Changes
 

Modified: branches/upstream/libhtml-template-pro-perl/current/t/HTML-Template-Expr.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libhtml-template-pro-perl/current/t/HTML-Template-Expr.t?rev=63145&op=diff
==============================================================================
--- branches/upstream/libhtml-template-pro-perl/current/t/HTML-Template-Expr.t (original)
+++ branches/upstream/libhtml-template-pro-perl/current/t/HTML-Template-Expr.t Fri Oct  1 14:37:04 2010
@@ -24,7 +24,7 @@
 HTML::Template::Pro->register_function( f2 => sub { return "F2: @_"; });
 HTML::Template::Pro->register_function( fUNDEF => sub { return undef; });
 
-my @exprset1=(ONE=>1,TWO=>2,THREE=>3,ZERO=>0,MINUSTEN=>-10, FILE=>'test_if1.tmpl', TWENTY=>20,FOURTY=>50);
+my @exprset1=(ONE=>1,TWO=>2,THREE=>3,ZERO=>0,MINUSTEN=>-10, FILE=>'test_if1.tmpl', TWENTY=>20,FOURTY=>50, EMPTYSTR=>'');
 my @brunoext=('FOO.BAR'=>'<test passed>');
 my @refset1=(
 HASHREF0=>[],

Added: branches/upstream/libhtml-template-pro-perl/current/t/htp_version.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libhtml-template-pro-perl/current/t/htp_version.t?rev=63145&op=file
==============================================================================
--- branches/upstream/libhtml-template-pro-perl/current/t/htp_version.t (added)
+++ branches/upstream/libhtml-template-pro-perl/current/t/htp_version.t Fri Oct  1 14:37:04 2010
@@ -1,0 +1,14 @@
+#!/usr/bin/perl -w
+use Test::More no_plan;
+use HTML::Template::Pro;
+
+my $src1 =<<"END;";
+<tmpl_var EXPR="version()">
+END;
+
+my $template1   = HTML::Template::Pro->new(scalarref => \$src1, debug=> 0);
+my $out=$template1->output();
+print $out;
+ok(length($out)>0); 
+
+__END__

Modified: branches/upstream/libhtml-template-pro-perl/current/templates-Pro/test_expr5.out
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libhtml-template-pro-perl/current/templates-Pro/test_expr5.out?rev=63145&op=diff
==============================================================================
--- branches/upstream/libhtml-template-pro-perl/current/templates-Pro/test_expr5.out (original)
+++ branches/upstream/libhtml-template-pro-perl/current/templates-Pro/test_expr5.out Fri Oct  1 14:37:04 2010
@@ -15,4 +15,11 @@
 false:0
 true:1
 
+good
+good
+true:1
+true:1
+true:1
+false:0
+
 </body></html>

Modified: branches/upstream/libhtml-template-pro-perl/current/templates-Pro/test_expr5.tmpl
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libhtml-template-pro-perl/current/templates-Pro/test_expr5.tmpl?rev=63145&op=diff
==============================================================================
--- branches/upstream/libhtml-template-pro-perl/current/templates-Pro/test_expr5.tmpl (original)
+++ branches/upstream/libhtml-template-pro-perl/current/templates-Pro/test_expr5.tmpl Fri Oct  1 14:37:04 2010
@@ -15,4 +15,11 @@
 false:<TMPL_VAR EXPR="'\'1' eq '\'2'">
 true:<TMPL_VAR EXPR="'\'1' ne '\'2'">
 
+<tmpl_if expr="(EMPTYSTR eq SystemRequest_MainNavigationSelection)">bad<tmpl_else>good</tmpl_if>
+<tmpl_if expr="(EMPTYSTR eq '')">good<tmpl_else>bad</tmpl_if>
+true:<TMPL_VAR EXPR="'a' ge ''">
+true:<TMPL_VAR EXPR="'a' gt ''">
+true:<TMPL_VAR EXPR="'a' le ''">
+false:<TMPL_VAR EXPR="'a' lt ''">
+
 </body></html>

Modified: branches/upstream/libhtml-template-pro-perl/current/tmplpro_version.c
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libhtml-template-pro-perl/current/tmplpro_version.c?rev=63145&op=diff
==============================================================================
--- branches/upstream/libhtml-template-pro-perl/current/tmplpro_version.c (original)
+++ branches/upstream/libhtml-template-pro-perl/current/tmplpro_version.c Fri Oct  1 14:37:04 2010
@@ -9,7 +9,11 @@
 #endif
 
 #ifndef PACKAGE_VERSION
+ #ifdef VERSION
+#define PACKAGE_VERSION VERSION
+ #else
 #define PACKAGE_VERSION "0.0(not defined)"
+ #endif
 #endif
 
 /*************************************************




More information about the Pkg-perl-cvs-commits mailing list