net-script-commits

[Jan T. <de...@us...>]

Update of /cvsroot/net-script/netscript2/src/perl/NetScript/Libraries
In directory sc8-pr-cvs1:/tmp/cvs-serv28899

Modified Files:
	ClassLibrary.pm ControlStructuresLibrary.pm DatabaseLibrary.pm 
	DateLibrary.pm Library.pm 
Log Message:
* implemented DAL

Index: ClassLibrary.pm
===================================================================
RCS file: /cvsroot/net-script/netscript2/src/perl/NetScript/Libraries/ClassLibrary.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ClassLibrary.pm	27 Oct 2002 11:07:35 -0000	1.4
--- ClassLibrary.pm	29 May 2003 16:04:26 -0000	1.5
***************
*** 125,130 ****
      
      my $node = $domWalker -> currentSource();
!     if ( $node -> getNamespaceURI() eq $NetScript::Interpreter::NAMESPACE_URI ) {
!         my $localName = $node -> getLocalName();
          if ($localName eq "class") {
              $this -> processClass( $domWalker, $node );
--- 125,130 ----
      
      my $node = $domWalker -> currentSource();
!     if ( $this -> dal() -> getNamespaceURI( $node ) eq $NetScript::Interpreter::NAMESPACE_URI ) {
!         my $localName = $this -> dal() -> getLocalName( $node );
          if ($localName eq "class") {
              $this -> processClass( $domWalker, $node );
***************
*** 155,161 ****
  sub newInstance {
      my ( $this, $domWalker, $node ) = @_;
!     my $var = $node -> getAttribute( "var" );
!     my $name = $node -> getAttribute( "name" );
!     my $class = $node -> getAttribute( "class" );
  
      my $se = $this -> interpreter() -> getStatementEvaluator();
--- 155,161 ----
  sub newInstance {
      my ( $this, $domWalker, $node ) = @_;
!     my $var = $this -> dal() -> getAttribute( $node, "var" );
!     my $name = $this -> dal() -> getAttribute( $node, "name" );
!     my $class = $this -> dal() -> getAttribute( $node, "class" );
  
      my $se = $this -> interpreter() -> getStatementEvaluator();
***************
*** 220,224 ****
  sub invokeMethod {
      my ( $this, $domWalker, $node ) = @_;
!     my $objectName = $node -> getAttribute( "var" );
      my $classObject = $this -> interpreter() -> getStatementEvaluator() -> 
              resolveObjectValue( $objectName );
--- 220,224 ----
  sub invokeMethod {
      my ( $this, $domWalker, $node ) = @_;
!     my $objectName = $this -> dal() -> getAttribute( $node, "var" );
      my $classObject = $this -> interpreter() -> getStatementEvaluator() -> 
              resolveObjectValue( $objectName );
***************
*** 231,235 ****
          }
      
!     my $methodName = $node -> getAttribute( "method" );           
      my $methodObject = $classObject -> getFunction( $methodName );
      unless( UNIVERSAL::isa( $methodObject, "NetScript::Engine::Function" ) ||
--- 231,235 ----
          }
      
!     my $methodName = $this -> dal() -> getAttribute( $node, "method" );           
      my $methodObject = $classObject -> getFunction( $methodName );
      unless( UNIVERSAL::isa( $methodObject, "NetScript::Engine::Function" ) ||
***************
*** 260,264 ****
          for ( @params  ) {
              my $paramName = $_;
!             my $paramValue = $node -> getAttribute( $paramName );
              $paramValue = $se -> evaluateStatement( $paramValue );
              $valParams{ $paramName } = $paramValue;
--- 260,264 ----
          for ( @params  ) {
              my $paramName = $_;
!             my $paramValue = $this -> dal() -> getAttribute( $node, $paramName );
              $paramValue = $se -> evaluateStatement( $paramValue );
              $valParams{ $paramName } = $paramValue;
***************
*** 275,279 ****
          for ( @paramsByVal  ) {
              my $paramName = $_;
!             my $paramValue = $node -> getAttribute( $paramName );
              $paramValue = $se -> evaluateStatement( $paramValue );
              $valParams{ $paramName } = $paramValue;
--- 275,279 ----
          for ( @paramsByVal  ) {
              my $paramName = $_;
!             my $paramValue = $this -> dal() -> getAttribute( $node, $paramName );
              $paramValue = $se -> evaluateStatement( $paramValue );
              $valParams{ $paramName } = $paramValue;
***************
*** 283,287 ****
          for ( @paramsByRef ) {
              my $paramName = $_;
!             my $paramValue = $node -> getAttribute( $paramName );
              $paramValue = $se -> evaluateStatement( $paramValue );
              my $memberObject = $se -> resolveObject( $paramValue );
--- 283,287 ----
          for ( @paramsByRef ) {
              my $paramName = $_;
!             my $paramValue = $this -> dal() -> getAttribute( $node, $paramName );
              $paramValue = $se -> evaluateStatement( $paramValue );
              my $memberObject = $se -> resolveObject( $paramValue );
***************
*** 337,368 ****
      my ( $this, $domWalker, $node ) = @_;
      my $classObject = NetScript::Engine::Class -> new();
!     my $className = $node -> getAttribute( "name" );
      $classObject -> setName( $className );
      $this -> { m_knownClasses } -> { $className } = $classObject;
      
      # parse the subtree looking for methods and members
!     my $children = $node -> getChildNodes();
!     my $length = $children -> getLength() - 1;
      for ( 0..$length ) {
!         my $child = $children -> item( $_ );
!         if ( $child -> getNodeType() == $XML::DOM2::Node::ELEMENT_NODE ) {
!             if ( $child -> getNamespaceURI() eq $NetScript::Interpreter::NAMESPACE_URI ) {
!                 if ( $child -> getLocalName() eq "member" ) {
                      my $memberObject = NetScript::Engine::Member -> new();
!                     my $name = $child -> getAttribute( "name" );
                      $memberObject -> setName( $name );
                      $classObject -> setMember( $memberObject );
                      }
!                 elsif ( $child -> getLocalName() eq "method" ) {
                      my $functionObject = NetScript::Engine::Function -> new();
!                     my $byValParameters = $child -> getAttribute( "byVal" );
                      my @valParams = split( /[\s,]+/, $byValParameters );
                      $functionObject -> setValueParameters( @valParams );
                      
!                     my $byReferenceParameters = $child -> getAttribute( "byRef" );
                      my @refParams = split( /[\s,]+/, $byReferenceParameters );
                      $functionObject -> setReferenceParameters( @refParams );
                      
!                     my $name = $child -> getAttribute( "name" );
                      $functionObject -> setName( $name );
                      $functionObject -> setCode( $child );
--- 337,369 ----
      my ( $this, $domWalker, $node ) = @_;
      my $classObject = NetScript::Engine::Class -> new();
!     my $className = $this -> dal() -> getAttribute( $node, "name" );
      $classObject -> setName( $className );
      $this -> { m_knownClasses } -> { $className } = $classObject;
      
      # parse the subtree looking for methods and members
!     my $children = $this -> dal() -> getChildNodes( $node );
!     my $length = $this -> dal() -> getLength( $children ) - 1;
      for ( 0..$length ) {
!         my $child = $this -> dal() -> getItemAt( $children,  $_ );
!         if ( $this -> dal() -> isElementNode( $child ) ) {
!             if ( $this -> dal() -> getNamespaceURI( $child ) eq $NetScript::Interpreter::NAMESPACE_URI ) {
!                 my $localname = $this -> dal() -> getLocalName( $child );
!                 if ( $localname eq "member" ) {
                      my $memberObject = NetScript::Engine::Member -> new();
!                     my $name = $this -> dal() -> getAttribute( $child, "name" );
                      $memberObject -> setName( $name );
                      $classObject -> setMember( $memberObject );
                      }
!                 elsif( $localname eq "method" ) {
                      my $functionObject = NetScript::Engine::Function -> new();
!                     my $byValParameters = $this -> dal() -> getAttribute( $child, "byVal" );
                      my @valParams = split( /[\s,]+/, $byValParameters );
                      $functionObject -> setValueParameters( @valParams );
                      
!                     my $byReferenceParameters = $this -> dal() -> getAttribute( $child, "byRef" );
                      my @refParams = split( /[\s,]+/, $byReferenceParameters );
                      $functionObject -> setReferenceParameters( @refParams );
                      
!                     my $name = $this -> dal() -> getAttribute( $child, "name" );
                      $functionObject -> setName( $name );
                      $functionObject -> setCode( $child );
***************
*** 383,388 ****
      my $domWalker = $event -> getEventUnknown();
      my $node = $domWalker -> currentSource();
!     if ( $node -> getNamespaceURI() eq $NetScript::Interpreter::NAMESPACE_URI ) {
!         my $localName = $node -> getLocalName();
          if ($localName eq "class") {
              return 0; # consume event
--- 384,389 ----
      my $domWalker = $event -> getEventUnknown();
      my $node = $domWalker -> currentSource();
!     if ( $this -> dal() -> getNamespaceURI( $node ) eq $NetScript::Interpreter::NAMESPACE_URI ) {
!         my $localName = $this -> dal() -> getLocalName( $node );
          if ($localName eq "class") {
              return 0; # consume event

Index: ControlStructuresLibrary.pm
===================================================================
RCS file: /cvsroot/net-script/netscript2/src/perl/NetScript/Libraries/ControlStructuresLibrary.pm,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** ControlStructuresLibrary.pm	29 Oct 2002 10:31:44 -0000	1.14
--- ControlStructuresLibrary.pm	29 May 2003 16:04:27 -0000	1.15
***************
*** 180,185 ****
      my $node = $domWalker -> currentSource();
  
!     if ( $node -> getNamespaceURI() eq $NetScript::Interpreter::NAMESPACE_URI ) {
!         my $localName = $node -> getLocalName();
          if ( $localName eq "if") {
              $this -> ifStart( $domWalker, $node );
--- 180,185 ----
      my $node = $domWalker -> currentSource();
  
!     if ( $this -> dal() -> getNamespaceURI( $node ) eq $NetScript::Interpreter::NAMESPACE_URI ) {
!         my $localName = $this -> dal() -> getLocalName( $node );
          if ( $localName eq "if") {
              $this -> ifStart( $domWalker, $node );
***************
*** 219,223 ****
  sub doFail {
      my ( $this, $domWalker, $node ) = @_;
!     my $msg = $node -> getAttribute( "message" );
      $msg = $this -> interpreter() -> getStatementEvaluator() -> 
              evaluateStatement( $msg );
--- 219,223 ----
  sub doFail {
      my ( $this, $domWalker, $node ) = @_;
!     my $msg = $this -> dal() -> getAttribute( $node, "message" );
      $msg = $this -> interpreter() -> getStatementEvaluator() -> 
              evaluateStatement( $msg );
***************
*** 235,239 ****
  sub checkNodeTest {
      my ($this, $node) = @_;
!     my $test = $node -> getAttribute("test");
      # replace variables
      my $se = $this -> interpreter() -> getStatementEvaluator();
--- 235,239 ----
  sub checkNodeTest {
      my ($this, $node) = @_;
!     my $test = $this -> dal() -> getAttribute( $node, "test");
      # replace variables
      my $se = $this -> interpreter() -> getStatementEvaluator();
***************
*** 273,287 ****
      my ( $this, $domWalker, $node ) = @_;
      # find the belonging IF-Node
!     my $ifNode = $node -> getPreviousSibling();
  
      # skip text nodes
!     while ( $ifNode && $ifNode -> getNodeType() == $XML::DOM2::Node::TEXT_NODE ) {
!         $ifNode = $ifNode -> getPreviousSibling();
          }
  
      if ( $ifNode && 
!             $ifNode -> getNamespaceURI() eq 
              $NetScript::Interpreter::NAMESPACE_URI &&
!             $ifNode -> getLocalName() eq "if") {
          
          # check condition
--- 273,287 ----
      my ( $this, $domWalker, $node ) = @_;
      # find the belonging IF-Node
!     my $ifNode = $this -> dal() -> getPreviousSibling( $node );
  
      # skip text nodes
!     while ( $ifNode && $this -> dal() -> isTextNode( $ifNode ) ) {
!         $ifNode = $this -> dal() -> getPreviousSibling( $ifNode );
          }
  
      if ( $ifNode && 
!             $this -> dal() -> getNamespaceURI( $ifNode ) eq 
              $NetScript::Interpreter::NAMESPACE_URI &&
!             $this -> dal() -> getLocalName( $ifNode ) eq "if") {
          
          # check condition
***************
*** 352,360 ****
      
  
!     my $from = $node -> getAttribute( "from" );
!     my $to = $node -> getAttribute( "to" );
!     my $var = $node -> getAttribute( "var" );
!     my $name = $node -> getAttribute( "name" );
!     my $step = $node -> getAttribute( "step" );
      
      my $varOrig = $var;
--- 352,360 ----
      
  
!     my $from = $this -> dal() -> getAttribute( $node, "from" );
!     my $to = $this -> dal() -> getAttribute( $node, "to" );
!     my $var = $this -> dal() -> getAttribute( $node, "var" );
!     my $name = $this -> dal() -> getAttribute( $node, "name" );
!     my $step = $this -> dal() -> getAttribute( $node, "step" );
      
      my $varOrig = $var;
***************
*** 457,481 ****
      my $domWalker = $event -> getEventUnknown();
      my $node = $domWalker -> currentSource();
!     if ( $node -> getNamespaceURI() eq $NetScript::Interpreter::NAMESPACE_URI ) {
!         my $localName = $node -> getLocalName();
!         if ($node -> getLocalName() eq "if") {
              # kill state
              $this -> interpreter() -> dropState();
              return 0; # consume event 
              }
!         elsif ($node -> getLocalName() eq "else") {
              # kill state
              $this -> interpreter() -> dropState();
              return 0; # consume event 
              }
!         elsif ($node -> getLocalName() eq "while" ) {
              $this -> whileEnd( $domWalker, $node );
              return 0; # consume event
              }
!         elsif ($node -> getLocalName() eq "for" ) {
              $this -> forEnd( $domWalker, $node );
              return 0; # consume event
              }
!         elsif ($node -> getLocalName() eq "ignore" ) {
              return 0; #consume event
              }
--- 457,481 ----
      my $domWalker = $event -> getEventUnknown();
      my $node = $domWalker -> currentSource();
!     if ( $this -> dal() -> getNamespaceURI( $node ) eq $NetScript::Interpreter::NAMESPACE_URI ) {
!         my $localName = $this -> dal() -> getLocalName( $node );
!         if ($localName eq "if") {
              # kill state
              $this -> interpreter() -> dropState();
              return 0; # consume event 
              }
!         elsif ($localName eq "else") {
              # kill state
              $this -> interpreter() -> dropState();
              return 0; # consume event 
              }
!         elsif ($localName eq "while" ) {
              $this -> whileEnd( $domWalker, $node );
              return 0; # consume event
              }
!         elsif ($localName eq "for" ) {
              $this -> forEnd( $domWalker, $node );
              return 0; # consume event
              }
!         elsif ($localName eq "ignore" ) {
              return 0; #consume event
              }
***************
*** 499,504 ****
      
      # Check for a NetScript-Related target
!     if ( $node -> getTarget() eq "netscript" ) {
!         my $data = $node -> getData();
          if ( $data =~ /^\s*use\s*([^\s]*)/) { # check for "use LIBNAME"
              my $libName = $1;
--- 499,504 ----
      
      # Check for a NetScript-Related target
!     if ( $this -> dal() -> getPITarget( $node ) eq "netscript" ) {
!         my $data = $this -> dal() -> getPIData( $node );
          if ( $data =~ /^\s*use\s*([^\s]*)/) { # check for "use LIBNAME"
              my $libName = $1;
***************
*** 525,530 ****
              my $document = undef;
              unless( eval {
!                 $document = $this -> interpreter() -> getDOMParser() ->
!                         parseString( $fileData );
                  1;        
              } ) { 
--- 525,529 ----
              my $document = undef;
              unless( eval {
!                 $document = $this -> dal() -> parseString( $fileData );
                  1;        
              } ) { 
***************
*** 569,576 ****
      my ( $this, $document, $domWalker, $node ) = @_;
      my $sourceDocument = $domWalker -> sourceDocument();
!     my $children = $document -> getChildNodes(); 
!     my $length = $children -> getLength() - 1;
!     my $parent = $node -> getParentNode();
!     my $sibling = $node -> getNextSibling();
  
      if ( $parent -> getNodeType() != $XML::DOM2::Node::ELEMENT_NODE ) {
--- 568,575 ----
      my ( $this, $document, $domWalker, $node ) = @_;
      my $sourceDocument = $domWalker -> sourceDocument();
!     my $children = $this -> dal() -> getChildNodes( $document ); 
!     my $length = $this -> dal() -> getLength( $children ) - 1;
!     my $parent = $this -> dal() -> getParentNode( $node );
!     my $sibling = $this -> dal() -> getNextSibling( $node );
  
      if ( $parent -> getNodeType() != $XML::DOM2::Node::ELEMENT_NODE ) {
***************
*** 581,591 ****
      # Import all nodes of the document to the current source document
      for ( 0..$length ) {
!         my $importedChild = $sourceDocument -> importNode( 
!                 $children -> item( $_ ), 1 );
          unless( defined( $sibling ) ) {
!             $parent -> appendChild( $importedChild );
              }
          else {
!             $parent -> insertBefore( $importedChild, $sibling );
              }
          }
--- 580,590 ----
      # Import all nodes of the document to the current source document
      for ( 0..$length ) {
!         my $importedChild = $this -> dal() -> importNode( $sourceDocument,
!                 $this -> dal() -> getItemAt( $children, $_ ), 1 );
          unless( defined( $sibling ) ) {
!             $this -> dal() -> appendChild( $parent, $importedChild );
              }
          else {
!             $this -> dal() -> insertBefore( $parent, $sibling, $importedChild );
              }
          }
***************
*** 593,597 ****
      $domWalker -> stepSourceNext();
      # remove PI
!     $parent -> removeChild( $node );
      }
  
--- 592,596 ----
      $domWalker -> stepSourceNext();
      # remove PI
!     $this -> dal() -> removeChild( $parent, $node );
      }
  
***************
*** 627,640 ****
      my $domWalker = $event -> getEventUnknown();
      my $sourceDocument = $domWalker -> currentSource();
!     my $children = $sourceDocument -> getChildNodes();
!     my $length = $children -> getLength() - 1;
      my $se = $this -> interpreter() -> getStatementEvaluator();
      
      for ( 0..$length ) {
!         my $child = $children -> item( $_ );
!         if ( $child -> getNodeType() == 
!                 $XML::DOM2::Node::PROCESSING_INSTRUCTION_NODE ) {
!             if ( $child -> getTarget() eq "netscript" ) {
!                 my $data = $child -> getData();
                  if ( $data =~ /^\s*rimport\s+([^\s]+)\s*/ ) {
                      my $fileURL = $1;
--- 626,638 ----
      my $domWalker = $event -> getEventUnknown();
      my $sourceDocument = $domWalker -> currentSource();
!     my $children = $this -> dal() -> getChildNodes( $sourceDocument );
!     my $length = $this -> dal() -> getLength( $children ) - 1;
      my $se = $this -> interpreter() -> getStatementEvaluator();
      
      for ( 0..$length ) {
!         my $child = $this -> dal() -> getItemAt( $children, $_ );
!         if ( $this -> dal() -> isProcessingInstructionNode( $child) ) {
!             if ( $this -> dal() -> getPITarget( $child ) eq "netscript" ) {
!                 my $data = $this -> dal() -> getPIData( $child );
                  if ( $data =~ /^\s*rimport\s+([^\s]+)\s*/ ) {
                      my $fileURL = $1;

Index: DatabaseLibrary.pm
===================================================================
RCS file: /cvsroot/net-script/netscript2/src/perl/NetScript/Libraries/DatabaseLibrary.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DatabaseLibrary.pm	23 Oct 2002 09:35:12 -0000	1.4
--- DatabaseLibrary.pm	29 May 2003 16:04:30 -0000	1.5
***************
*** 148,158 ****
      my ( $this, $domWalker, $node ) = @_;
      my %settings = ();
!     $settings{ "host" } = $node -> getAttribute( "host" );
!     $settings{ "port" } = $node -> getAttribute( "port" );
!     $settings{ "type" } = $node -> getAttribute( "type" );
!     $settings{ "username" } = $node -> getAttribute( "username" );
!     $settings{ "password" } = $node -> getAttribute( "password" );
!     $settings{ "database" } = $node -> getAttribute( "database" );
!     my $name = $node -> getAttribute( "handle" );
      unless( defined( $name ) ) {
          $this -> interpreter() -> getEventRelay() -> createAndRaiseEvent(
--- 148,158 ----
      my ( $this, $domWalker, $node ) = @_;
      my %settings = ();
!     $settings{ "host" } = $this -> dal() -> getAttribute( $node, "host" );
!     $settings{ "port" } = $this -> dal() -> getAttribute( $node, "port" );
!     $settings{ "type" } = $this -> dal() -> getAttribute( $node, "type" );
!     $settings{ "username" } = $this -> dal() -> getAttribute( $node, "username" );
!     $settings{ "password" } = $this -> dal() -> getAttribute( $node, "password" );
!     $settings{ "database" } = $this -> dal() -> getAttribute( $node, "database" );
!     my $name = $this -> dal() -> getAttribute( $node, "handle" );
      unless( defined( $name ) ) {
          $this -> interpreter() -> getEventRelay() -> createAndRaiseEvent(
***************
*** 172,176 ****
  sub runStatement {
      my ( $this, $domWalker, $node )  = @_;
!     my $dbName = $node -> getAttribute( "handle" );
      if ( $dbName eq "" ) {
          $this -> interpreter() -> getEventRelay() -> createAndRaiseEvent(
--- 172,176 ----
  sub runStatement {
      my ( $this, $domWalker, $node )  = @_;
!     my $dbName = $this -> dal() -> getAttribute( $node, "handle" );
      if ( $dbName eq "" ) {
          $this -> interpreter() -> getEventRelay() -> createAndRaiseEvent(
***************
*** 214,218 ****
  
      # now we can execute the statement...
!     my $statement = $node -> getAttribute( "query" );
      if ( $statement eq "" ) {
          $this -> interpreter() -> getEventRelay() -> createAndRaiseEvent(
--- 214,218 ----
  
      # now we can execute the statement...
!     my $statement = $this -> dal() -> getAttribute( $node, "query" );
      if ( $statement eq "" ) {
          $this -> interpreter() -> getEventRelay() -> createAndRaiseEvent(
***************
*** 228,233 ****
      $resultSet -> execute();
  
!     my $name = $node -> getAttribute( "name" );
!     my $var = $node -> getAttribute( "var" );
      if ( $var ne "" || $name ne "" ) {
          my $classWrapper = NetScript::Engine::ClassWrapper -> new( $this );
--- 228,233 ----
      $resultSet -> execute();
  
!     my $name = $this -> dal() -> getAttribute( $node, "name" );
!     my $var = $this -> dal() -> getAttribute( $node, "var" );
      if ( $var ne "" || $name ne "" ) {
          my $classWrapper = NetScript::Engine::ClassWrapper -> new( $this );
***************
*** 331,336 ****
      my $domWalker = $event -> getEventUnknown();
      my $refNode = $domWalker -> currentSource();
!     if ( $refNode -> getNamespaceURI() eq $DB_NAMESPACE_URI ) {
!         my $nodeName = $refNode -> getLocalName();
          
          if ( $nodeName eq "settings" ) {
--- 331,336 ----
      my $domWalker = $event -> getEventUnknown();
      my $refNode = $domWalker -> currentSource();
!     if ( $this -> dal() -> getNamespaceURI( $refNode ) eq $DB_NAMESPACE_URI ) {
!         my $nodeName = $this -> dal() -> getLocalName( $refNode );
          
          if ( $nodeName eq "settings" ) {
***************
*** 355,360 ****
      my $domWalker = $event -> getEventUnknown();
      my $refNode = $domWalker -> currentSource();
!     if ( $refNode -> getNamespaceURI() eq $DB_NAMESPACE_URI ) {
!         my $nodeName = $refNode -> getLocalName();
          
          if ( $nodeName eq "settings" ) {
--- 355,360 ----
      my $domWalker = $event -> getEventUnknown();
      my $refNode = $domWalker -> currentSource();
!     if ( $this -> dal() -> getNamespaceURI( $refNode ) eq $DB_NAMESPACE_URI ) {
!         my $nodeName = $this -> dal() -> getLocalName( $refNode );
          
          if ( $nodeName eq "settings" ) {

Index: DateLibrary.pm
===================================================================
RCS file: /cvsroot/net-script/netscript2/src/perl/NetScript/Libraries/DateLibrary.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DateLibrary.pm	27 Sep 2002 17:53:36 -0000	1.1
--- DateLibrary.pm	29 May 2003 16:04:30 -0000	1.2
***************
*** 130,135 ****
      my $domWalker = $event -> getEventUnknown();
      my $node = $domWalker -> currentSource();
!     if ( $node -> getNamespaceURI() eq $DATE_NAMESPACE_URI ) {
!         my $name = $node -> getLocalName();
          if ($name eq "roll") {
              $this -> doRoll( $node, $domWalker );
--- 130,135 ----
      my $domWalker = $event -> getEventUnknown();
      my $node = $domWalker -> currentSource();
!     if ( $this -> dal() -> getNamespaceURI( $node ) eq $DATE_NAMESPACE_URI ) {
!         my $name = $this -> dal() -> getLocalName( $node );
          if ($name eq "roll") {
              $this -> doRoll( $node, $domWalker );
***************
*** 158,163 ****
      my $domWalker = $event -> getEventUnknown();
      my $node = $domWalker -> currentSource();
!     if ( $node -> getNamespaceURI() eq $DATE_NAMESPACE_URI ) {
!         my $name = $node -> getLocalName();
          if ($name eq "roll"  || $name eq "format") {
              0; # consume event 
--- 158,163 ----
      my $domWalker = $event -> getEventUnknown();
      my $node = $domWalker -> currentSource();
!     if ( $this -> dal() -> getNamespaceURI( $node ) eq $DATE_NAMESPACE_URI ) {
!         my $name = $this -> dal() -> getLocalName( $node );
          if ($name eq "roll"  || $name eq "format") {
              0; # consume event 
***************
*** 192,197 ****
      }
              
!     my $date = $se -> evaluateStatement( $node -> getAttribute( "date" ) );
!     my $format = $se -> evaluateStatement( $node -> getAttribute( "format" ) );
      
      my ( $sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst) =
--- 192,197 ----
      }
              
!     my $date = $se -> evaluateStatement( $this -> dal() -> getAttribute( $node, "date" ) );
!     my $format = $se -> evaluateStatement( $this -> dal() -> getAttribute( $node, "format" ) );
      
      my ( $sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst) =
***************
*** 199,208 ****
  
  
!     my $secAdd = $se -> evaluateStatement( $node -> getAttribute( "second" ) );
!     my $minAdd = $se -> evaluateStatement( $node -> getAttribute( "minute" ) );
!     my $hourAdd = $se -> evaluateStatement( $node -> getAttribute( "hour" ) );
!     my $dayAdd = $se -> evaluateStatement( $node -> getAttribute( "day" ) );
!     my $monAdd = $se -> evaluateStatement( $node -> getAttribute( "month" ) );
!     my $yearAdd = $se -> evaluateStatement( $node -> getAttribute( "year" ) );
      
      # XXX: the timelocal function doesnt work for months, so we have to roll 
--- 199,208 ----
  
  
!     my $secAdd = $se -> evaluateStatement( $this -> dal() -> getAttribute( $node, "second" ) );
!     my $minAdd = $se -> evaluateStatement( $this -> dal() -> getAttribute( $node, "minute" ) );
!     my $hourAdd = $se -> evaluateStatement( $this -> dal() -> getAttribute( $node, "hour" ) );
!     my $dayAdd = $se -> evaluateStatement( $this -> dal() -> getAttribute( $node, "day" ) );
!     my $monAdd = $se -> evaluateStatement( $this -> dal() -> getAttribute( $node, "month" ) );
!     my $yearAdd = $se -> evaluateStatement( $this -> dal() -> getAttribute( $node, "year" ) );
      
      # XXX: the timelocal function doesnt work for months, so we have to roll 
***************
*** 250,255 ****
      my $se = $this -> interpreter() -> getStatementEvaluator();
      
!     my $date = $se -> evaluateStatement( $node -> getAttribute( "date" ) );
!     my $format = $se -> evaluateStatement( $node -> getAttribute( "format" ) );
      
      my ( $sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst) =
--- 250,255 ----
      my $se = $this -> interpreter() -> getStatementEvaluator();
      
!     my $date = $se -> evaluateStatement( $this -> dal() -> getAttribute( $node, "date" ) );
!     my $format = $se -> evaluateStatement( $this -> dal() -> getAttribute( $node, "format" ) );
      
      my ( $sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst) =

Index: Library.pm
===================================================================
RCS file: /cvsroot/net-script/netscript2/src/perl/NetScript/Libraries/Library.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Library.pm	14 Aug 2002 22:23:35 -0000	1.7
--- Library.pm	29 May 2003 16:04:30 -0000	1.8
***************
*** 48,51 ****
--- 48,52 ----
      my ($this, $interpreter) = @_;
      $this -> { m_interpreter } = $interpreter;
+     $this -> { m_DAL } = $interpreter -> getDAL();
      }
  
***************
*** 79,84 ****
  sub getVariableInfo {
      my ( $this, $element )  = @_;
!     my $name = $element -> getAttribute( "name" );
!     my $var = $element -> getAttribute( "var" );
      
      my $se = $this -> interpreter() -> getStatementEvaluator();
--- 80,85 ----
  sub getVariableInfo {
      my ( $this, $element )  = @_;
!     my $name = $this -> dal() -> getAttribute( $element, "name" );
!     my $var =  $this -> dal() -> getAttribute( $element, "var" );
      
      my $se = $this -> interpreter() -> getStatementEvaluator();
***************
*** 115,118 ****
--- 116,127 ----
      my ( $this ) = @_;
      $this -> { m_interpreter };
+     }
+ 
+ #/**
+ # Returns the currently used DAL.
+ #*/
+ sub dal {
+     my ( $this ) = @_;
+     $this -> { m_DAL };
      }