openinteract-commits — CVS updates for OpenInteract/SPOPS

[Openinteract-commits] CVS: OpenInteract2/extra_packages/delicious_tags/template tagged_objects_page.tmpl,NONE,1.1

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/extra_packages/delicious_tags/template
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13387/template

Added Files:
	tagged_objects_page.tmpl 
Log Message:
full page for displaying tagged objects



--- NEW FILE: tagged_objects_page.tmpl ---
[% PROCESS error_message %]

<h2>Objects by Tag</h2>

<p><b>Tag:</b> [% tag %]</p>

<p>
[% INCLUDE delicious_tags::tagged_objects %]
</p>

[Openinteract-commits] CVS: OpenInteract2/t url.t,1.12,1.13

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/t
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12917/t

Modified Files:
	url.t 
Log Message:
add strip_deployment_context() method to OI2::URL, plus tests

Index: url.t
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/t/url.t,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** url.t	24 Nov 2004 14:16:01 -0000	1.12
--- url.t	25 Nov 2004 03:51:43 -0000	1.13
***************
*** 7,11 ****
  require 'utils.pl';
  use OpenInteract2::Context qw( CTX );
! use Test::More  tests => 104;
  
  initialize_context();
--- 7,11 ----
  require 'utils.pl';
  use OpenInteract2::Context qw( CTX );
! use Test::More  tests => 109;
  
  initialize_context();
***************
*** 325,329 ****
--- 325,352 ----
  
  {
+     my $url = '/OpenInteract/foo/bar';
+     my $strip_url = $UCL->strip_deployment_context( $url );
+     is( $strip_url, '/foo/bar',
+         'Strip context from URL with additional info' );
+     $url = '/OpenInteract/';
+     $strip_url = $UCL->strip_deployment_context( $url );
+     is( $strip_url, '/',
+         'Strip context from URL with slash but no additional info' );
+     $url = '/OpenInteract';
+     $strip_url = $UCL->strip_deployment_context( $url );
+     is( $strip_url, '',
+         'Strip context from URL with no slash and no additional info' );
+     $url = '/OpenInteract2';
+     $strip_url = $UCL->strip_deployment_context( $url );
+     is( $strip_url, '/OpenInteract2',
+         'Do not strip context from URL with more info than deployment context, no slash' );
+     $url = '/OpenInteract2/';
+     $strip_url = $UCL->strip_deployment_context( $url );
+     is( $strip_url, '/OpenInteract2/',
+         'Do not strip context from URL with more info than deployment context, slash' );
+ }
  
+ 
+ {
      CTX->assign_deploy_url( '' );
      my %params = ( id => 55, undercover => 'yes' );
***************
*** 343,346 ****
--- 366,370 ----
  }
  
+ 
  # TODO: Once we get the test website/actions setup, create tests for
  # parse_action() (we don't need as many -- just ones to test a known

[Openinteract-commits] CVS: OpenInteract2/lib/OpenInteract2 URL.pm,1.26,1.27

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12917/lib/OpenInteract2

Modified Files:
	URL.pm 
Log Message:
add strip_deployment_context() method to OI2::URL, plus tests

Index: URL.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/URL.pm,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** URL.pm	24 Nov 2004 14:16:01 -0000	1.26
--- URL.pm	25 Nov 2004 03:51:44 -0000	1.27
***************
*** 186,189 ****
--- 186,206 ----
  }
  
+ ########################################
+ # URL REMOVAL
+ 
+ sub strip_deployment_context {
+     my ( $class, $url ) = @_;
+     return ''  unless ( $url );
+     return '/' if ( $url eq '/' );
+     return ''  if ( $url eq DEPLOY_URL );
+ 
+     # Since we've taken care of the '/context' case with the previous
+     # statement we can assume any deployment context ends with a '/'
+ 
+     my $deployment_context = DEPLOY_URL;
+     $url =~ s|^$deployment_context/|/|;
+     return $url;
+ }
+ 
  1;
  
***************
*** 544,547 ****
--- 561,569 ----
   # $url_with_params = '/foo/bar?keep=no&id=55&undercover=yes
  
+ B<strip_deployment_context( $url )>
+ 
+ Removes any deployment context from C<$url> and returns the modified
+ string.
+ 
  =head1 SEE ALSO
  

[Openinteract-commits] CVS: OpenInteract2/extra_packages/delicious_tags/OpenInteract2 DeliciousTag.pm,1.2,1.3 DeliciousTaggableObject.pm,1.3,1.4

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/extra_packages/delicious_tags/OpenInteract2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4789/OpenInteract2

Modified Files:
	DeliciousTag.pm DeliciousTaggableObject.pm 
Log Message:
changes up to 0.05 (fairly minor, just fixes)

Index: DeliciousTag.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/extra_packages/delicious_tags/OpenInteract2/DeliciousTag.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DeliciousTag.pm	25 Oct 2004 02:29:31 -0000	1.2
--- DeliciousTag.pm	25 Nov 2004 03:14:04 -0000	1.3
***************
*** 5,11 ****
--- 5,15 ----
  use strict;
  use DateTime;
+ use Log::Log4perl            qw( get_logger );
+ use OpenInteract2::Constants qw( :log );
  
  @OpenInteract2::DeliciousTag::ISA = qw( OpenInteract2::DeliciousTagPersist );
  
+ my ( $log );
+ 
  # this should be wrapped in a transaction...
  
***************
*** 95,100 ****
  sub fetch_tags_with_count_for_object {
      my ( $class, $object_type, $object_id ) = @_;
!     my $tags = $class->fetch_tags_for_object( $object_type, $object_id );
!     return $class->_fetch_counts_for_tags( $tags );
  }
  
--- 99,110 ----
  sub fetch_tags_with_count_for_object {
      my ( $class, $object_type, $object_id ) = @_;
!     $log ||= get_logger( LOG_APP );
!     my $tags = $class->fetch_tags_for_object( $object_type, $object_id ) || [];
!     $log->is_info &&
!         $log->info( "For [$object_type: $object_id] got ",
!                     "tags: ", join( ', ', @{ $tags } ) );
!     return ( scalar @{ $tags } )
!              ? $class->_fetch_counts_for_tags( $tags )
!              : [];
  }
  
***************
*** 153,157 ****
  sub _create_or_clause_for_tags {
      my ( $class, @tags ) = @_;
!     return '(' . join( ' OR ', map { 'tag = ?' } @tags ) . ')';
  }
  
--- 163,172 ----
  sub _create_or_clause_for_tags {
      my ( $class, @tags ) = @_;
!     $log ||= get_logger( LOG_APP );
!     my $clause = '(' . join( ' OR ', map { 'tag = ?' } grep { $_ } @tags ) . ')';
!     $log->is_info &&
!         $log->info( "Created WHERE clause '$clause' for ",
!                     "tags: ",join( ', ', @tags ) );
!     return $clause;
  }
  

Index: DeliciousTaggableObject.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/extra_packages/delicious_tags/OpenInteract2/DeliciousTaggableObject.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DeliciousTaggableObject.pm	25 Nov 2004 02:25:02 -0000	1.3
--- DeliciousTaggableObject.pm	25 Nov 2004 03:14:04 -0000	1.4
***************
*** 7,10 ****
--- 7,11 ----
  sub c_add_tags {
      my ( $class, $object_type, $object_id, $url, $name, @tags ) = @_;
+     require OpenInteract2::DeliciousTag;
      return OpenInteract2::DeliciousTag
                 ->add_tags( $object_type, $object_id, $url, $name, @tags );
***************
*** 13,16 ****
--- 14,18 ----
  sub c_fetch_my_tags {
      my ( $class, $object_type, $id ) = @_;
+     require OpenInteract2::DeliciousTag;
      return OpenInteract2::DeliciousTag
                 ->fetch_tags_for_object( $object_type, $id );
***************
*** 19,22 ****
--- 21,25 ----
  sub c_fetch_my_tags_with_count {
      my ( $class, $object_type, $id ) = @_;
+     require OpenInteract2::DeliciousTag;
      return OpenInteract2::DeliciousTag
                 ->fetch_tags_with_count_for_object( $object_type, $id );
***************
*** 25,28 ****
--- 28,32 ----
  sub c_fetch_my_related_object_info {
      my ( $class, $object_type, $id, @tags ) = @_;
+     require OpenInteract2::DeliciousTag;
      my $related_tags = OpenInteract2::DeliciousTag
                             ->fetch_related_tags( $object_type, $id, @tags );

[Openinteract-commits] CVS: OpenInteract2/extra_packages/delicious_tags/conf action.ini,1.1,1.2 spops.ini,1.3,1.4

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/extra_packages/delicious_tags/conf
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4789/conf

Modified Files:
	action.ini spops.ini 
Log Message:
changes up to 0.05 (fairly minor, just fixes)

Index: action.ini
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/extra_packages/delicious_tags/conf/action.ini,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** action.ini	24 Oct 2004 16:40:08 -0000	1.1
--- action.ini	25 Nov 2004 03:14:04 -0000	1.2
***************
*** 9,15 ****
  title     = Related Tags
  
  [tagged_objects]
  class           = OpenInteract2::Action::DeliciousTags
! task            = related_objects
  is_secure       = no
  template_source = delicious_tags::tagged_objects
--- 9,16 ----
  title     = Related Tags
  
+ # meant to be used as component
  [tagged_objects]
  class           = OpenInteract2::Action::DeliciousTags
! task            = tagged_objects
  is_secure       = no
  template_source = delicious_tags::tagged_objects

Index: spops.ini
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/extra_packages/delicious_tags/conf/spops.ini,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** spops.ini	25 Nov 2004 02:23:51 -0000	1.3
--- spops.ini	25 Nov 2004 03:14:04 -0000	1.4
***************
*** 1,4 ****
--- 1,5 ----
  [delicious_tag]
  class              = OpenInteract2::DeliciousTagPersist
+ alias              = OpenInteract2::DeliciousTag
  field              = 
  field_discover     = yes

[Openinteract-commits] CVS: OpenInteract2/extra_packages/delicious_tags/OpenInteract2/Observer AddDeliciousTags.pm,1.2,1.3

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/extra_packages/delicious_tags/OpenInteract2/Observer
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4789/OpenInteract2/Observer

Modified Files:
	AddDeliciousTags.pm 
Log Message:
changes up to 0.05 (fairly minor, just fixes)

Index: AddDeliciousTags.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/extra_packages/delicious_tags/OpenInteract2/Observer/AddDeliciousTags.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AddDeliciousTags.pm	25 Nov 2004 02:24:24 -0000	1.2
--- AddDeliciousTags.pm	25 Nov 2004 03:14:04 -0000	1.3
***************
*** 14,18 ****
  sub update {
      my ( $class, $action, $observation ) = @_;
!     return unless ( $observation eq 'post save' );
  
      require OpenInteract2::DeliciousTaggableObject;
--- 14,25 ----
  sub update {
      my ( $class, $action, $observation ) = @_;
!     $log ||= get_logger( LOG_APP );
!     $log->is_debug &&
!         $log->debug( "delicious tag observer caught: $observation" );
!     unless ( $observation =~ /^post (add|update)$/ ) {
!         $log->is_debug &&
!             $log->debug( "Ignoring: not 'post add' or 'post update'" );
!         return;
!     }
  
      require OpenInteract2::DeliciousTaggableObject;
***************
*** 20,24 ****
      my $action_desc = join( '', '(from action/task: ',
                                   $action->name, '/', $action->task, ')' );
-     $log ||= get_logger( LOG_APP );
      my $object = $action->param( 'object' ) || $action->param( 'c_object' );
      unless ( $object ) {
--- 27,30 ----
***************
*** 33,36 ****
--- 39,45 ----
          return;
      }
+     my $object_desc = ref( $object ) . ': ' . $object->id;
+     $log->is_info &&
+         $log->info( "Will add tags '$tag_listing' to '$object_desc'" );
      my @all_tags = split /\s+/, $tag_listing;
      OpenInteract2::DeliciousTaggableObject::add_tags( $object, @all_tags );
***************
*** 65,69 ****
  =item *
  
! Only reacts to 'post save' observations; all others are ignored.
  
  =item *
--- 74,80 ----
  =item *
  
! Only reacts to 'post add' or 'post update' observations; all others
! are ignored. (By coincidence these are issued by the common
! actions...)
  
  =item *

[Openinteract-commits] CVS: OpenInteract2/extra_packages/delicious_tags Changes,1.3,1.4 MANIFEST,1.3,1.4 package.conf,1.3,1.4

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/extra_packages/delicious_tags
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4789

Modified Files:
	Changes MANIFEST package.conf 
Log Message:
changes up to 0.05 (fairly minor, just fixes)

Index: Changes
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/extra_packages/delicious_tags/Changes,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Changes	26 Oct 2004 03:29:03 -0000	1.3
--- Changes	25 Nov 2004 03:14:04 -0000	1.4
***************
*** 1,4 ****
--- 1,12 ----
  Revision history for OpenInteract2 package delicious_tags.
  
+ 0.05  Wed Nov 24 22:11:33 EST 2004
+ 
+       Try and get kinks out...
+ 
+ 0.04  Wed Nov 24 21:29:38 EST 2004
+ 
+       Cosmetic
+ 
  0.03  Mon Oct 25 23:27:09 EDT 2004
  

Index: MANIFEST
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/extra_packages/delicious_tags/MANIFEST,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MANIFEST	26 Oct 2004 03:29:03 -0000	1.3
--- MANIFEST	25 Nov 2004 03:14:04 -0000	1.4
***************
*** 15,18 ****
  OpenInteract2/Observer/AddDeliciousTags.pm
  OpenInteract2/SQLInstall/DeliciousTags.pm
! template/related_tags_box.tmpl
  template/tagged_objects.tmpl
--- 15,18 ----
  OpenInteract2/Observer/AddDeliciousTags.pm
  OpenInteract2/SQLInstall/DeliciousTags.pm
! template/related_tags.tmpl
  template/tagged_objects.tmpl

Index: package.conf
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/extra_packages/delicious_tags/package.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** package.conf	26 Oct 2004 03:29:03 -0000	1.3
--- package.conf	25 Nov 2004 03:14:04 -0000	1.4
***************
*** 1,4 ****
  name             delicious_tags
! version          0.03
  author           Chris Winters <ch...@cw...>
  url              http://www.openinteract.org/
--- 1,4 ----
  name             delicious_tags
! version          0.05
  author           Chris Winters <ch...@cw...>
  url              http://www.openinteract.org/

[Openinteract-commits] CVS: OpenInteract2/extra_packages/delicious_tags/template tagged_objects.tmpl,1.1,1.2

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/extra_packages/delicious_tags/template
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4789/template

Modified Files:
	tagged_objects.tmpl 
Log Message:
changes up to 0.05 (fairly minor, just fixes)

Index: tagged_objects.tmpl
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/extra_packages/delicious_tags/template/tagged_objects.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tagged_objects.tmpl	24 Oct 2004 16:40:09 -0000	1.1
--- tagged_objects.tmpl	25 Nov 2004 03:14:05 -0000	1.2
***************
*** 1,4 ****
! [% FOREACH ti = tag_info;
!        item_url = OI.make_url( BASE = ti.url, do_not_escape = 1 ) %]
! o [% ti.object_type %]: <a href="[% item_url %]">[% ti.name %]</a> <br />
  [% END %]
\ No newline at end of file
--- 1,4 ----
! [% FOREACH info = tag_info;
!        item_url = OI.make_url( BASE = info.url, do_not_escape = 1 ) %]
! o [% info.object_type %]: <a href="[% item_url %]">[% info.name %]</a> <br />
  [% END %]
\ No newline at end of file

[Openinteract-commits] CVS: OpenInteract2/extra_packages/delicious_tags/doc delicious_tags.pod,1.2,1.3

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/extra_packages/delicious_tags/doc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4789/doc

Modified Files:
	delicious_tags.pod 
Log Message:
changes up to 0.05 (fairly minor, just fixes)

Index: delicious_tags.pod
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/extra_packages/delicious_tags/doc/delicious_tags.pod,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** delicious_tags.pod	25 Oct 2004 02:29:30 -0000	1.2
--- delicious_tags.pod	25 Nov 2004 03:14:04 -0000	1.3
***************
*** 8,13 ****
   # it will attach tags found in the request variable 'delicious_tags'
   # to the object found in the action parameter 'object' or 'c_object'
!  # (this is done automatically for you if you're using the Common
!  # actions)
   
   # in $WEBSITE_DIR/conf/observer.ini
--- 8,14 ----
   # it will attach tags found in the request variable 'delicious_tags'
   # to the object found in the action parameter 'object' or 'c_object'
!  # whenever it's saved or issues a 'post add' or 'post update'
!  # notification; this is done automatically for you if you're using
!  # the Common actions
   
   # in $WEBSITE_DIR/conf/observer.ini
***************
*** 30,36 ****
   is_taggable = yes
  
!  # Once marked as taggable you can execute methods:
   
!  # Find tags attached to object
   
   my $tags = $myobject->fetch_my_tags;
--- 31,37 ----
   is_taggable = yes
  
!  # Once marked as taggable you can execute methods that:
   
!  # - Find tags attached to object
   
   my $tags = $myobject->fetch_my_tags;
***************
*** 43,53 ****
   }
    
!  # Find other objects with any of the same tags as this one
   my $related_info = $myobject->fetch_related_object_info;
  
!  # Find other objects with the tag 'sometag'
   my $related_info = $myobject->fetch_related_object_info( 'sometag' );
  
!  # Find other objects with the tags 'sometag' or 'someothertag'
   my $related_info = $myobject->fetch_related_object_info( 'sometag', 'someothertag' );
   
--- 44,54 ----
   }
    
!  # - Find other objects with any of the same tags as this one
   my $related_info = $myobject->fetch_related_object_info;
  
!  # - Find other objects with the tag 'sometag'
   my $related_info = $myobject->fetch_related_object_info( 'sometag' );
  
!  # - Find other objects with the tags 'sometag' or 'someothertag'
   my $related_info = $myobject->fetch_related_object_info( 'sometag', 'someothertag' );
   
***************
*** 119,129 ****
  No actions defined in this package.
  
! =head1 RULESETS
  
! No rulesets defined in this package.
  
! =head1 BUGS 
  
! None known.
  
  =head1 AUTHORS
--- 120,130 ----
  No actions defined in this package.
  
! =head1 OBSERVERS
  
! L<OpenInteract2::Observer::AddDeliciousTags>
  
! =head1 RULESETS
  
! No rulesets defined in this package.
  
  =head1 AUTHORS

[Openinteract-commits] CVS: OpenInteract2/extra_packages/delicious_tags/template related_tags.tmpl,NONE,1.1 related_tags_box.tmpl,1.1,NONE

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/extra_packages/delicious_tags/template
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4550

Added Files:
	related_tags.tmpl 
Removed Files:
	related_tags_box.tmpl 
Log Message:
rename related tags template

--- NEW FILE: related_tags.tmpl ---
[% FOREACH tag_count = tag_and_count;
     tagged_objects_url = OI.make_url( ACTION = 'tags',
                                       TASK   = 'show_tagged_objects',
                                       tag    = tag_count.0 ); %]
o <a href="">[% tag_count.0 %]</a> ([% tag_count.1 %]) <br />
[% END %]
--- related_tags_box.tmpl DELETED ---

[Openinteract-commits] CVS: OpenInteract2/extra_packages/delicious_tags/OpenInteract2 DeliciousTaggableObject.pm,1.2,1.3

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/extra_packages/delicious_tags/OpenInteract2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27049/OpenInteract2

Modified Files:
	DeliciousTaggableObject.pm 
Log Message:
...


Index: DeliciousTaggableObject.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/extra_packages/delicious_tags/OpenInteract2/DeliciousTaggableObject.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DeliciousTaggableObject.pm	25 Oct 2004 02:29:31 -0000	1.2
--- DeliciousTaggableObject.pm	25 Nov 2004 02:25:02 -0000	1.3
***************
*** 4,8 ****
  
  use strict;
- use OpenInteract2::DeliciousTag;
  
  sub c_add_tags {
--- 4,7 ----

[Openinteract-commits] CVS: OpenInteract2/extra_packages/delicious_tags/OpenInteract2/Observer AddDeliciousTags.pm,1.1,1.2

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/extra_packages/delicious_tags/OpenInteract2/Observer
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26983/OpenInteract2/Observer

Modified Files:
	AddDeliciousTags.pm 
Log Message:
don't 'use' until necessary


Index: AddDeliciousTags.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/extra_packages/delicious_tags/OpenInteract2/Observer/AddDeliciousTags.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AddDeliciousTags.pm	25 Oct 2004 02:29:30 -0000	1.1
--- AddDeliciousTags.pm	25 Nov 2004 02:24:24 -0000	1.2
***************
*** 7,11 ****
  use OpenInteract2::Constants qw( :log );
  use OpenInteract2::Context   qw( CTX );
- use OpenInteract2::DeliciousTaggableObject;
  
  $OpenInteract2::Observer::AddDeliciousTags::VERSION  = sprintf("%d.%02d", q$Revision$ =~ /(\d+)\.(\d+)/);
--- 7,10 ----
***************
*** 17,20 ****
--- 16,21 ----
      return unless ( $observation eq 'post save' );
  
+     require OpenInteract2::DeliciousTaggableObject;
+ 
      my $action_desc = join( '', '(from action/task: ',
                                   $action->name, '/', $action->task, ')' );

[Openinteract-commits] CVS: OpenInteract2/extra_packages/delicious_tags/conf spops.ini,1.2,1.3

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/extra_packages/delicious_tags/conf
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26839/conf

Modified Files:
	spops.ini 
Log Message:
fix class name


Index: spops.ini
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/extra_packages/delicious_tags/conf/spops.ini,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** spops.ini	25 Oct 2004 02:29:30 -0000	1.2
--- spops.ini	25 Nov 2004 02:23:51 -0000	1.3
***************
*** 1,4 ****
  [delicious_tag]
! class              = OpenInteract2::DeliciousTagsPersist
  field              = 
  field_discover     = yes
--- 1,4 ----
  [delicious_tag]
! class              = OpenInteract2::DeliciousTagPersist
  field              = 
  field_discover     = yes

[Openinteract-commits] CVS: OpenInteract2/t url.t,1.11,1.12

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/t
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19555/t

Modified Files:
	url.t 
Log Message:
add 'add_params_to_url()' to OI2::URL and a pointer to it from OI2::TT2::Plugin; plus tests

Index: url.t
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/t/url.t,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** url.t	4 Oct 2004 04:06:22 -0000	1.11
--- url.t	24 Nov 2004 14:16:01 -0000	1.12
***************
*** 7,11 ****
  require 'utils.pl';
  use OpenInteract2::Context qw( CTX );
! use Test::More  tests => 96;
  
  initialize_context();
--- 7,11 ----
  require 'utils.pl';
  use OpenInteract2::Context qw( CTX );
! use Test::More  tests => 104;
  
  initialize_context();
***************
*** 324,327 ****
--- 324,346 ----
  }
  
+ {
+ 
+     CTX->assign_deploy_url( '' );
+     my %params = ( id => 55, undercover => 'yes' );
+     my $create_url = $UCL->add_params_to_url( '/foo', \%params );
+     compare_urls( '/foo', \%params, $create_url,
+                   'Add params to plain URL' );
+     $create_url = $UCL->add_params_to_url( '/foo?evil=very', \%params );
+     compare_urls( '/foo', { %params, evil => 'very' }, $create_url,
+                   'Add params to URL with query args' );
+     $create_url = $UCL->add_params_to_url( '/foo is bar', \%params );
+     compare_urls( '/foo is bar', \%params, $create_url,
+                   'Add params to plain URL and ensure it is not escaped' );
+     $create_url = $UCL->add_params_to_url( '/foo is bar?evil=very', \%params );
+     compare_urls( '/foo is bar', { %params, evil => 'very' }, $create_url,
+                   'Add params to URL with query args and ensure it is not escaped' );
+ 
+ }
+ 
  # TODO: Once we get the test website/actions setup, create tests for
  # parse_action() (we don't need as many -- just ones to test a known

[Openinteract-commits] CVS: OpenInteract2/lib/OpenInteract2 URL.pm,1.25,1.26

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19555/lib/OpenInteract2

Modified Files:
	URL.pm 
Log Message:
add 'add_params_to_url()' to OI2::URL and a pointer to it from OI2::TT2::Plugin; plus tests

Index: URL.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/URL.pm,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** URL.pm	4 Oct 2004 12:54:32 -0000	1.25
--- URL.pm	24 Nov 2004 14:16:01 -0000	1.26
***************
*** 128,136 ****
      return $url_base unless ( scalar keys %{ $params } );
  
  	my $query = join( QUERY_ARG_SEPARATOR,
                        map  { _url_escape( $_ ) . "=" . _url_escape( $params->{ $_ } ) }
                        grep { defined $params->{ $_ } }
                        keys %{ $params } );
!     return "$url_base?$query";
  
  }
--- 128,143 ----
      return $url_base unless ( scalar keys %{ $params } );
  
+     return $class->add_params_to_url( $url_base, $params );
+ }
+ 
+ sub add_params_to_url {
+     my ( $class, $url, $params ) = @_;
  	my $query = join( QUERY_ARG_SEPARATOR,
                        map  { _url_escape( $_ ) . "=" . _url_escape( $params->{ $_ } ) }
                        grep { defined $params->{ $_ } }
                        keys %{ $params } );
!     return ( $url =~ /\?/ ) 
!              ? join( QUERY_ARG_SEPARATOR, $url, $query )
!              : "$url?$query";
  
  }
***************
*** 516,519 ****
--- 523,547 ----
   # $url = '/cgi-bin/oi.cgi/Public/Foo/detail/?name=Mario%20Lemieux'
  
+ C<add_params_to_url( $url, \%params )>
+ 
+ Adds the escaped key/value pairs in C<\%params> as GET parameters to
+ C<$url>, which is assumed to be contextualized and escaped already.
+ 
+ So:
+ 
+  my $url = '/foo/bar';
+  my %params = ( id => '55', undercover => 'yes' );
+  my $url_with_params = OpenInteract2::URL->add_params_to_url( $url, \%params );
+  # $url_with_params = '/foo/bar?id=55&undercover=yes
+ 
+ The method can detect if you've already got query parameters in your
+ url:
+ 
+ 
+  my $url = '/foo/bar?keep=no';
+  my %params = ( id => '55', undercover => 'yes' );
+  my $url_with_params = OpenInteract2::URL->add_params_to_url( $url, \%params );
+  # $url_with_params = '/foo/bar?keep=no&id=55&undercover=yes
+ 
  =head1 SEE ALSO
  

[Openinteract-commits] CVS: OpenInteract2/lib/OpenInteract2/TT2 Plugin.pm,1.14,1.15

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/TT2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19555/lib/OpenInteract2/TT2

Modified Files:
	Plugin.pm 
Log Message:
add 'add_params_to_url()' to OI2::URL and a pointer to it from OI2::TT2::Plugin; plus tests

Index: Plugin.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/TT2/Plugin.pm,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Plugin.pm	24 Oct 2004 16:17:29 -0000	1.14
--- Plugin.pm	24 Nov 2004 14:16:01 -0000	1.15
***************
*** 342,345 ****
--- 342,350 ----
  my $U = OpenInteract2::URL->new();
  
+ sub add_params_to_url {
+     my ( $self, $url, $p ) = @_;
+     return $U->add_params_to_url( $url, $p );
+ }
+ 
  sub make_url {
      my ( $self, $p ) = @_;
***************
*** 705,708 ****
--- 710,717 ----
   Item: [% OI.html_decode( news.news_item ) %]
   
+  # Add parameters to an existing URL
+  [% display_no_template_url = OI.add_params_to_url( my_path, no_template = 'yes' ) %]
+  <a href="[% display_no_template_url %]">View Printable</a>
+ 
   # Works, but not as useful...
   [% edit_url = OI.make_url( BASE = '/User/show/', user_id = OI.login.user_id,
***************
*** 1171,1174 ****
--- 1180,1191 ----
   <p>This is the first paragraph</p>
  
+ B<add_params_to_url( $url, \%params )>
+ 
+ Delegates to L<OpenInteract2::URL> for C<add_params_to_url()> which
+ just adds the key/value pairs in C<\%params> to C<$url>, adding a
+ query separator if necessary and doing any escaping of the
+ paramters.. Note that C<$url> is already presumed to be contextualized
+ (under the correct deployment context) and will not be escaped.
+ 
  B<make_url( \%params )>
  

[Openinteract-commits] CVS: OpenInteract2/extra_packages/wiki MANIFEST,1.1,1.2

[Salve J. N. <sj...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/extra_packages/wiki
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28755

Modified Files:
	MANIFEST 
Log Message:
Renaming wiki_messages_en.msg to wiki_messages-en.msg, so the filename
correctly shows its country code


Index: MANIFEST
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/extra_packages/wiki/MANIFEST,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MANIFEST	3 Jun 2004 13:04:43 -0000	1.1
--- MANIFEST	23 Nov 2004 12:29:31 -0000	1.2
***************
*** 5,9 ****
  conf/action.ini
  doc/wiki.pod
! msg/wiki_messages_en.msg
  OpenInteract2/Wiki.pm
  OpenInteract2/WikiObjectShell.pm
--- 5,9 ----
  conf/action.ini
  doc/wiki.pod
! msg/wiki_messages-en.msg
  OpenInteract2/Wiki.pm
  OpenInteract2/WikiObjectShell.pm

[Openinteract-commits] CVS: OpenInteract2/extra_packages/wiki/msg wiki_messages-en.msg,NONE,1.1 wiki_messages_en.msg,1.1,NONE

[Salve J. N. <sj...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/extra_packages/wiki/msg
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28755/msg

Added Files:
	wiki_messages-en.msg 
Removed Files:
	wiki_messages_en.msg 
Log Message:
Renaming wiki_messages_en.msg to wiki_messages-en.msg, so the filename
correctly shows its country code


--- NEW FILE: wiki_messages-en.msg ---
wiki.preview = Preview
wiki.save = Save
wiki.search = Search
wiki.view = View
wiki.version = Version:
wiki.other_versions = Other versions:
wiki.no_other_versions = no previous versions

wiki.link_home = Home
wiki.link_all_pages = All Pages
wiki.link_recent = Recent Changes
wiki.link_references = Referenced By

wiki.no_nodes = No pages

wiki.all_nodes_title = All Pages

wiki.recent_nodes_title = Recently Changed Pages

wiki.referenced_by_title = List Referencing Pages
wiki.nodes_referencing = The following pages reference [[_0]]

wiki.search_results_title = Search Results
wiki.search_results_summary = The following pages match [_0]

wiki.edit_title = Editing Page [_0]

wiki.preview_title = Previewing Page [_0]

--- wiki_messages_en.msg DELETED ---

[Openinteract-commits] CVS: OpenInteract2/lib/OpenInteract2 Context.pm,1.75,1.76

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15174

Modified Files:
	Context.pm 
Log Message:
OIN-70: when assigning a via 'action_table()', add an eval {} around
each Action object instantiation; if it fails don't blow up but issue
an error and remove that action configuration from the table.


Index: Context.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Context.pm,v
retrieving revision 1.75
retrieving revision 1.76
diff -C2 -d -r1.75 -r1.76
*** Context.pm	27 Sep 2004 13:45:49 -0000	1.75
--- Context.pm	20 Nov 2004 20:12:18 -0000	1.76
***************
*** 178,185 ****
      my $timezone = $server_config->{timezone};
      unless ( $timezone ) {
-         $log_init->warn( "No timezone set in server configuration! Please ",
-                          "set the configuration key 'Global.timezone' to ",
-                          "a valid DateTime::TimeZone value." );
          $timezone = 'America/New_York';
      }
      my $timezone_object = DateTime::TimeZone->new( name => $timezone );
--- 178,188 ----
      my $timezone = $server_config->{timezone};
      unless ( $timezone ) {
          $timezone = 'America/New_York';
+         $log_init->warn(
+             "No timezone set in server configuration! Please set the ",
+             "configuration key 'Global.timezone' to a valid ",
+             "DateTime::TimeZone value. (I'm going to be a cultural ",
+             "imperialist and assume '$timezone')."
+         );
      }
      my $timezone_object = DateTime::TimeZone->new( name => $timezone );
***************
*** 194,199 ****
      $self->assign_deploy_image_url;
      $self->assign_deploy_static_url;
-     #$self->assign_request_type;
-     #$self->assign_response_type;
      $log_init->is_info &&
          $log_init->info( "Assigned constants from server config ok" );
--- 197,200 ----
***************
*** 786,793 ****
              $log_act->is_debug &&
                  $log_act->debug( "Finding URL(s) for action '$name'" );
!             my $action = OpenInteract2::Action->new( $info );
!             my $respond_urls = $action->get_dispatch_urls;
!             $url_to_name{ $_ } = $name for ( @{ $respond_urls } );
!             $info->{url_primary} = $respond_urls->[0];
          }
          $self->server_config->{action_url} = \%url_to_name;
--- 787,803 ----
              $log_act->is_debug &&
                  $log_act->debug( "Finding URL(s) for action '$name'" );
!             my $action = eval { OpenInteract2::Action->new( $info ) };
!             if ( $@ ) {
!                 $log_act->error(
!                     "Failed to create action '$name' when assigned a new ",
!                     "set of action configurations. Will remove action data ",
!                     "from action table. Error: $@" );
!                 delete $self->server_config->{action}->{ $name };
!             }
!             else {
!                 my $respond_urls = $action->get_dispatch_urls;
!                 $url_to_name{ $_ } = $name for ( @{ $respond_urls } );
!                 $info->{url_primary} = $respond_urls->[0];
!             }
          }
          $self->server_config->{action_url} = \%url_to_name;

[Openinteract-commits] CVS: OpenInteract2/lib/OpenInteract2/Config Ini.pm,1.16,1.17

[Salve J. N. <sj...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Config
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7112/lib/OpenInteract2/Config

Modified Files:
	Ini.pm 
Log Message:
Silence warning


Index: Ini.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Config/Ini.pm,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Ini.pm	27 Sep 2004 13:24:55 -0000	1.16
--- Ini.pm	9 Nov 2004 13:56:54 -0000	1.17
***************
*** 305,309 ****
  
      $filename ||= $self->{_m}{filename} || 'config.ini';
!     my ( $original_filename );
      if ( -f $filename ) {
          $original_filename = $filename;
--- 305,309 ----
  
      $filename ||= $self->{_m}{filename} || 'config.ini';
!     my ( $original_filename ) = "";
      if ( -f $filename ) {
          $original_filename = $filename;

[Openinteract-commits] CVS: OpenInteract2/lib/OpenInteract2/Config GlobalOverride.pm,1.9,1.10

[Salve J. N. <sj...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Config
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6724/lib/OpenInteract2/Config

Modified Files:
	GlobalOverride.pm 
Log Message:
Silence warnings


Index: GlobalOverride.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Config/GlobalOverride.pm,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** GlobalOverride.pm	27 Sep 2004 13:24:55 -0000	1.9
--- GlobalOverride.pm	9 Nov 2004 13:54:09 -0000	1.10
***************
*** 232,235 ****
--- 232,237 ----
      unless ( $item->{ $key } ) {
          $item->{ $key } = []  if ( $type eq 'list' );
+         $item->{ $key } = {}  if ( $type eq 'hash' );
+         $item->{ $key } = ''  if ( $type eq '' );
      }
  

[Openinteract-commits] CVS: OpenInteract2/lib/OpenInteract2 DatasourceManager.pm,1.15,1.16 FullTextRules.pm,1.2,1.3 Manage.pm,1.40,1.41

[Salve J. N. <sj...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6048/lib/OpenInteract2

Modified Files:
	DatasourceManager.pm FullTextRules.pm Manage.pm 
Log Message:
Silence warnings


Index: DatasourceManager.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/DatasourceManager.pm,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** DatasourceManager.pm	27 Sep 2004 13:24:54 -0000	1.15
--- DatasourceManager.pm	9 Nov 2004 13:49:37 -0000	1.16
***************
*** 48,51 ****
--- 48,52 ----
          my $rv = eval { $connection->ping };
          if ( $@ or ! $rv ) {
+             $rv = "undef()" unless defined $rv;
              $log->warn( "Cannot ping connection '$ds_name': [Error: $@] ",
                          "[Return: $rv]; will try to reopen..." );

Index: FullTextRules.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/FullTextRules.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FullTextRules.pm	13 Jun 2004 02:02:14 -0000	1.2
--- FullTextRules.pm	9 Nov 2004 13:49:37 -0000	1.3
***************
*** 105,111 ****
      }
  
!     my ( $indexable );
      foreach my $field ( @{ $field_list } ) {
!         if ( ! ref $self->{ $field } ) {
              $indexable = join( ' ', $indexable, $self->{ $field } );
          }
--- 105,111 ----
      }
  
!     my ( $indexable ) = "";
      foreach my $field ( @{ $field_list } ) {
!         if ( defined $self->{ $field } and ! ref $self->{ $field } ) {
              $indexable = join( ' ', $indexable, $self->{ $field } );
          }
***************
*** 115,122 ****
  
          # This is for 'page' objects that use a filehandle
!         else {
              my $fh = $self->{ $field };
              $indexable = join( ' ', $indexable, <$fh> );
          }
      }
      return \$indexable;
--- 115,125 ----
  
          # This is for 'page' objects that use a filehandle
!         elsif ( ref $self->{ $field } eq 'GLOB' ) {
              my $fh = $self->{ $field };
              $indexable = join( ' ', $indexable, <$fh> );
          }
+         else {
+             $log->info( "Cannot index object '$field' (not a SCALAR or GLOB)");
+         }
      }
      return \$indexable;

Index: Manage.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/Manage.pm,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** Manage.pm	12 Jun 2004 19:01:51 -0000	1.40
--- Manage.pm	9 Nov 2004 13:49:37 -0000	1.41
***************
*** 378,385 ****
      my @opt = ();
      while ( my ( $name, $info ) = each %{ $all_params } ) {
!         if ( $info->{is_boolean} eq 'yes' ) {
              push @opt, $name;
          }
!         elsif ( $info->{is_multivalued} eq 'yes' ) {
              push @opt, "$name=s@";
          }
--- 378,387 ----
      my @opt = ();
      while ( my ( $name, $info ) = each %{ $all_params } ) {
!         if ( defined $info->{is_boolean} and
!              $info->{is_boolean} eq 'yes' ) {
              push @opt, $name;
          }
!         elsif ( defined $info->{is_multivalued} and
!                 $info->{is_multivalued} eq 'yes' ) {
              push @opt, "$name=s@";
          }
***************
*** 452,456 ****
              $current_action = $s->{action};
          }
!         if ( $s->{action} ne $current_action ) {
              push @new_status, { action => $current_action,
                                  status => [ @tmp_status ] };
--- 454,458 ----
              $current_action = $s->{action};
          }
!         if ( defined $s->{action} and $s->{action} ne $current_action ) {
              push @new_status, { action => $current_action,
                                  status => [ @tmp_status ] };

[Openinteract-commits] CVS: OpenInteract2/script oi2_manage,1.27,1.28

[Salve J. N. <sj...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/script
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6048/script

Modified Files:
	oi2_manage 
Log Message:
Silence warnings


Index: oi2_manage
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/script/oi2_manage,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** oi2_manage	27 Sep 2004 03:46:53 -0000	1.27
--- oi2_manage	9 Nov 2004 13:49:37 -0000	1.28
***************
*** 113,116 ****
--- 113,117 ----
  
      for ( $OPT{website_dir}, $OPT{package_dir}, $OPT{source_dir} ) {
+         next unless defined $_;
          s/[\\|\/]+$//;
          s/^~/$ENV{HOME}/
***************
*** 297,301 ****
  sub show_parameter_error {
      my ( $err ) = @_;
!     my $out = "One or more parameters failed task checks. Task not executed.\n",
                "Here are the parameters that failed and the reason for each.\n\n";
      my $failed = $err->parameter_fail || {};
--- 298,302 ----
  sub show_parameter_error {
      my ( $err ) = @_;
!     my $out = "One or more parameters failed task checks. Task not executed.\n".
                "Here are the parameters that failed and the reason for each.\n\n";
      my $failed = $err->parameter_fail || {};
***************
*** 337,341 ****
      return unless ( $type eq 'progress' );
      warn "PROGRESS: $message\n";
!     if ( $params->{long} eq 'yes' ) {
          warn " ... this may take a while ...\n";
      }
--- 338,342 ----
      return unless ( $type eq 'progress' );
      warn "PROGRESS: $message\n";
!     if ( defined $params->{long} and $params->{long} eq 'yes' ) {
          warn " ... this may take a while ...\n";
      }
***************
*** 345,348 ****
--- 346,351 ----
      my ( $task, $type, $status ) = @_;
      return unless ( $type eq 'status' );
+     $status->{action} ||= "unknown";
+     $status->{message} ||= "unknown";
      my $show_ok   = ( $status->{is_ok} eq 'yes' )
                        ? 'OK' : 'FAILED';

[Openinteract-commits] CVS: OpenInteract2/pkg/system_doc/msg system_doc-messages-en.msg,1.1,1.2

[Salve J. N. <sj...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/pkg/system_doc/msg
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2722/pkg/system_doc/msg

Modified Files:
	system_doc-messages-en.msg 
Log Message:
Mention the Template::Toolkit manual in the system documentation page.


Index: system_doc-messages-en.msg
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/pkg/system_doc/msg/system_doc-messages-en.msg,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** system_doc-messages-en.msg	16 Feb 2004 18:04:15 -0000	1.1
--- system_doc-messages-en.msg	9 Nov 2004 13:30:36 -0000	1.2
***************
*** 11,15 ****
  sys_doc.menu.starting = Good places to start out for OpenInteract and SPOPS are \
      the POD manuals shipped with the distributions. See \
!     <a href="[_1]">OpenInteract2::Manual</a> and <a href="[_2]">SPOPS::Manual</a>.
  sys_doc.menu.package = <a href="[_1]">View Package Documentation</a>: This \
      allows you to browse the documentation that comes with each package. \
--- 11,17 ----
  sys_doc.menu.starting = Good places to start out for OpenInteract and SPOPS are \
      the POD manuals shipped with the distributions. See \
!     <a href="[_1]">OpenInteract2::Manual</a> and <a href="[_2]">SPOPS::Manual</a>. \
!     A look through the <a href="[_3]">Template::Manual</a> might also be \
!     worth your time.
  sys_doc.menu.package = <a href="[_1]">View Package Documentation</a>: This \
      allows you to browse the documentation that comes with each package. \

[Openinteract-commits] CVS: OpenInteract2/pkg/system_doc/template system_doc_menu.tmpl,1.3,1.4

[Salve J. N. <sj...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/pkg/system_doc/template
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2722/pkg/system_doc/template

Modified Files:
	system_doc_menu.tmpl 
Log Message:
Mention the Template::Toolkit manual in the system documentation page.


Index: system_doc_menu.tmpl
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/pkg/system_doc/template/system_doc_menu.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** system_doc_menu.tmpl	16 Feb 2004 18:04:15 -0000	1.3
--- system_doc_menu.tmpl	9 Nov 2004 13:30:36 -0000	1.4
***************
*** 6,9 ****
--- 6,12 ----
                                  TASK   = 'display',
                                  module = 'SPOPS::Manual' );
+    tt_man_url = OI.make_url( ACTION = 'systemdoc',
+                              TASK   = 'display',
+                              module = 'Template::Manual' );
     pkg_url    = OI.make_url( ACTION = 'systemdoc',
                               TASK   = 'package_list' );
***************
*** 14,18 ****
  <h2>[% MSG( 'sys_doc.menu.title' ) %]</h2>
  
! <p>[% MSG( 'sys_doc.menu.starting', oi_man_url, spops_man_url ) %]</p>
  
  <p>[% MSG( 'sys_doc.menu.package', pkg_url ) %]</p>
--- 17,21 ----
  <h2>[% MSG( 'sys_doc.menu.title' ) %]</h2>
  
! <p>[% MSG( 'sys_doc.menu.starting', oi_man_url, spops_man_url, tt_man_url ) %]</p>
  
  <p>[% MSG( 'sys_doc.menu.package', pkg_url ) %]</p>