You can subscribe to this list here.
2003 |
Jan
|
Feb
|
Mar
|
Apr
(200) |
May
(51) |
Jun
(19) |
Jul
(69) |
Aug
(21) |
Sep
(3) |
Oct
(3) |
Nov
(12) |
Dec
(1) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2004 |
Jan
(8) |
Feb
(1) |
Mar
(9) |
Apr
(5) |
May
(18) |
Jun
(11) |
Jul
(1) |
Aug
|
Sep
(1) |
Oct
|
Nov
(1) |
Dec
(85) |
2005 |
Jan
(4) |
Feb
|
Mar
(6) |
Apr
|
May
(1) |
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
(7) |
Nov
(2) |
Dec
|
2006 |
Jan
(1) |
Feb
(2) |
Mar
|
Apr
|
May
(10) |
Jun
|
Jul
(1) |
Aug
(3) |
Sep
(2) |
Oct
(17) |
Nov
(2) |
Dec
|
2007 |
Jan
|
Feb
(19) |
Mar
(20) |
Apr
(56) |
May
(24) |
Jun
(22) |
Jul
(15) |
Aug
(17) |
Sep
(8) |
Oct
(20) |
Nov
(27) |
Dec
(41) |
2008 |
Jan
(3) |
Feb
(34) |
Mar
(14) |
Apr
(77) |
May
(42) |
Jun
(17) |
Jul
(14) |
Aug
(11) |
Sep
(6) |
Oct
(2) |
Nov
(3) |
Dec
(2) |
2009 |
Jan
(15) |
Feb
(15) |
Mar
(8) |
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
(5) |
Sep
(1) |
Oct
|
Nov
(1) |
Dec
|
2010 |
Jan
|
Feb
|
Mar
(3) |
Apr
|
May
|
Jun
(8) |
Jul
(1) |
Aug
(10) |
Sep
(7) |
Oct
|
Nov
|
Dec
|
2011 |
Jan
|
Feb
(4) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2012 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(4) |
Sep
|
Oct
|
Nov
|
Dec
|
2013 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
2014 |
Jan
|
Feb
(1) |
Mar
|
Apr
(2) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2015 |
Jan
|
Feb
(4) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2020 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <rd...@us...> - 2009-08-26 21:51:24
|
Revision: 1996 http://digir.svn.sourceforge.net/digir/?rev=1996&view=rev Author: rdg Date: 2009-08-26 21:51:14 +0000 (Wed, 26 Aug 2009) Log Message: ----------- Column mappings are now allowed to be made against concepts associated with nodes outside the indexing element scope. IMPORTANT: this will only work when the corresponding values are the same for the entire record set returned in search responses. Modified Paths: -------------- tapirlink/trunk/classes/TpSchemaInspector.php Modified: tapirlink/trunk/classes/TpSchemaInspector.php =================================================================== --- tapirlink/trunk/classes/TpSchemaInspector.php 2009-08-26 21:45:36 UTC (rev 1995) +++ tapirlink/trunk/classes/TpSchemaInspector.php 2009-08-26 21:51:14 UTC (rev 1996) @@ -715,28 +715,35 @@ if ( strcasecmp( $mapping_type, 'SingleColumnMapping' ) == 0 and ! TpServiceUtils::Contains( $path, $this->mIndexingElement ) ) { - $msg = 'Node "'.$path.'" has an incompatible local '. - 'mapping type (single column mapping) for being '. - 'outside the indexingElement'; + $msg = 'Node "'.$path.'" is outside the indexing element and '. + 'was mapped to a column. This will only work if the '. + 'corresponding value is the same for the entire record '. + 'set returned!'; - if ( $expression->IsRequired() ) - { - TpDiagnostics::Append( DC_UNSUPPORTED_OUTPUT_MODEL, $msg, - DIAG_ERROR ); + TpDiagnostics::Append( DC_CONFIG_ISSUE, $msg, DIAG_WARN ); - $this->_ActivateAbort( $path ); - } - else - { - $msg .= ' It will be discarded.'; + // Restrictions removed to allow many-to-one + // relationships being used outside the indexing + // element scope - TpDiagnostics::Append( DC_TRUNCATED_RESPONSE, $msg, - DIAG_WARN ); - } +// if ( $expression->IsRequired() ) +// { +// TpDiagnostics::Append( DC_UNSUPPORTED_OUTPUT_MODEL, $msg, +// DIAG_ERROR ); - array_push( $this->mRejectedPaths, $path ); +// $this->_ActivateAbort( $path ); +// } +// else +// { +// $msg .= ' It will be discarded.'; - return false; +// TpDiagnostics::Append( DC_TRUNCATED_RESPONSE, $msg, +// DIAG_WARN ); +// } + +// array_push( $this->mRejectedPaths, $path ); + +// return false; } } else This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rd...@us...> - 2009-08-26 21:45:48
|
Revision: 1995 http://digir.svn.sourceforge.net/digir/?rev=1995&view=rev Author: rdg Date: 2009-08-26 21:45:36 +0000 (Wed, 26 Aug 2009) Log Message: ----------- New diagnostic code DC_CONFIG_ISSUE. Modified Paths: -------------- tapirlink/trunk/misc/diag_codes.xml tapirlink/trunk/www/diagnostic_codes.html tapirlink/trunk/www/tapir_diagnostics.php Modified: tapirlink/trunk/misc/diag_codes.xml =================================================================== --- tapirlink/trunk/misc/diag_codes.xml 2009-08-26 20:49:04 UTC (rev 1994) +++ tapirlink/trunk/misc/diag_codes.xml 2009-08-26 21:45:36 UTC (rev 1995) @@ -102,6 +102,9 @@ The configuration information for the provider could not be found or loaded, and hence the requested operation could not be completed. </code> + <code const="DC_CONFIG_ISSUE" value="CONFIGURATION_ISSUE" level="warn"> +A potential issue was detected in the configuration. +</code> <code const="DC_LOG_ERROR" value="LOG_ERROR" level="error"> Problem occured when opening or writing to a log file. </code> @@ -109,7 +112,7 @@ A catch-all diagnostic for where no other appropriate category is available. </code> <code const="DC_MISSING_LIBRARY" value="MISSING_LIBRARY" level="warn"> -The specified library is not available. +The specified library is unavailable. </code> <code const="DC_DURATION" value="DURATION" level="info"> A float value indicating the number of seconds to produce the response. Modified: tapirlink/trunk/www/diagnostic_codes.html =================================================================== --- tapirlink/trunk/www/diagnostic_codes.html 2009-08-26 20:49:04 UTC (rev 1994) +++ tapirlink/trunk/www/diagnostic_codes.html 2009-08-26 21:45:36 UTC (rev 1995) @@ -222,6 +222,13 @@ </td> </tr> <tr> +<td>CONFIGURATION_ISSUE</td> +<td>warn</td> +<td> +A potential issue was detected in the configuration. +</td> +</tr> + <tr> <td>LOG_ERROR</td> <td>error</td> <td> @@ -239,7 +246,7 @@ <td>MISSING_LIBRARY</td> <td>warn</td> <td> -The specified library is not available. +The specified library is unavailable. </td> </tr> <tr> Modified: tapirlink/trunk/www/tapir_diagnostics.php =================================================================== --- tapirlink/trunk/www/tapir_diagnostics.php 2009-08-26 20:49:04 UTC (rev 1994) +++ tapirlink/trunk/www/tapir_diagnostics.php 2009-08-26 21:45:36 UTC (rev 1995) @@ -191,6 +191,12 @@ /**** +A potential issue was detected in the configuration. +*/ +define('DC_CONFIG_ISSUE','CONFIGURATION_ISSUE'); + + +/**** Problem occured when opening or writing to a log file. */ define('DC_LOG_ERROR','LOG_ERROR'); @@ -203,7 +209,7 @@ /**** -The specified library is not available. +The specified library is unavailable. */ define('DC_MISSING_LIBRARY','MISSING_LIBRARY'); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rd...@us...> - 2009-08-26 20:49:12
|
Revision: 1994 http://digir.svn.sourceforge.net/digir/?rev=1994&view=rev Author: rdg Date: 2009-08-26 20:49:04 +0000 (Wed, 26 Aug 2009) Log Message: ----------- Minor changes. Modified Paths: -------------- tapirlink/trunk/classes/TpConfigManager.php tapirlink/trunk/classes/TpMappingForm.php Modified: tapirlink/trunk/classes/TpConfigManager.php =================================================================== --- tapirlink/trunk/classes/TpConfigManager.php 2009-08-26 19:47:22 UTC (rev 1993) +++ tapirlink/trunk/classes/TpConfigManager.php 2009-08-26 20:49:04 UTC (rev 1994) @@ -120,11 +120,11 @@ // Check that session is working - session_destroy(); + session_destroy(); session_start(); $_SESSION['test'] = '1'; session_write_close(); - $_SESSION = array(); + $_SESSION = array(); session_start(); if ( ! isset( $_SESSION['test'] ) ) Modified: tapirlink/trunk/classes/TpMappingForm.php =================================================================== --- tapirlink/trunk/classes/TpMappingForm.php 2009-08-26 19:47:22 UTC (rev 1993) +++ tapirlink/trunk/classes/TpMappingForm.php 2009-08-26 20:49:04 UTC (rev 1994) @@ -537,7 +537,7 @@ { // Remove all possible content from cache (query templates, // output models and response structures) since this kind of - // cached data largely depends on what it mapped. + // cached data largely depends on what is mapped. $cache_dir = TP_CACHE_DIR . '/' . $this->mResource->GetCode(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rd...@us...> - 2009-08-26 19:47:32
|
Revision: 1993 http://digir.svn.sourceforge.net/digir/?rev=1993&view=rev Author: rdg Date: 2009-08-26 19:47:22 +0000 (Wed, 26 Aug 2009) Log Message: ----------- Shortened error message. Modified Paths: -------------- tapirlink/trunk/classes/TpMappingForm.php Modified: tapirlink/trunk/classes/TpMappingForm.php =================================================================== --- tapirlink/trunk/classes/TpMappingForm.php 2009-08-26 19:45:48 UTC (rev 1992) +++ tapirlink/trunk/classes/TpMappingForm.php 2009-08-26 19:47:22 UTC (rev 1993) @@ -294,9 +294,7 @@ { $msg = 'Current mapping for concept "'.$concept->GetName().'"'. ' ('.$table.'.'.$field.') does not exist in the '. - 'database'.isset( $this->mTablesAndColumns[$table] ).'-'. - is_array( $this->mTablesAndColumns[$table] ).'-'. - isset( $this->mTablesAndColumns[$table][$field] ).TpUtils::DumpArray($this->mTablesAndColumns[$table]); + 'database'; TpDiagnostics::Append( CFG_DATA_VALIDATION_ERROR, $msg, DIAG_ERROR ); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rd...@us...> - 2009-08-26 19:45:59
|
Revision: 1992 http://digir.svn.sourceforge.net/digir/?rev=1992&view=rev Author: rdg Date: 2009-08-26 19:45:48 +0000 (Wed, 26 Aug 2009) Log Message: ----------- Avoid PHP error when array values are objects. Modified Paths: -------------- tapirlink/trunk/classes/TpUtils.php Modified: tapirlink/trunk/classes/TpUtils.php =================================================================== --- tapirlink/trunk/classes/TpUtils.php 2009-07-23 14:12:50 UTC (rev 1991) +++ tapirlink/trunk/classes/TpUtils.php 2009-08-26 19:45:48 UTC (rev 1992) @@ -647,7 +647,8 @@ foreach ( $a as $key => $val ) { - $s .= "\n(".$key.')='.$val; + $s .= "\n(".$key.')='; + $s .= (is_object( $val )) ? 'obj' : $val; } return $s; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rd...@us...> - 2009-07-23 14:12:55
|
Revision: 1991 http://digir.svn.sourceforge.net/digir/?rev=1991&view=rev Author: rdg Date: 2009-07-23 14:12:50 +0000 (Thu, 23 Jul 2009) Log Message: ----------- Commented debug msg. Modified Paths: -------------- tapirlink/trunk/classes/TpDiagnostics.php Modified: tapirlink/trunk/classes/TpDiagnostics.php =================================================================== --- tapirlink/trunk/classes/TpDiagnostics.php 2009-03-21 20:58:50 UTC (rev 1990) +++ tapirlink/trunk/classes/TpDiagnostics.php 2009-07-23 14:12:50 UTC (rev 1991) @@ -75,14 +75,16 @@ } global $g_dlog; - $g_dlog->debug("Appending ".$severity." when level is ".TP_DIAG_LEVEL); + //if ( is_object( $g_dlog ) ) + //{ + // $g_dlog->debug("Appending ".$severity." when level is ".TP_DIAG_LEVEL); + //} + $stack =& TpDiagnostics::_GetStack(); array_push( $stack, new TpDiagnostic( $cd, $msg, $severity ) ); - global $g_dlog; - if ( is_object( $g_dlog ) ) { $g_dlog->debug( '>> System message: '.$msg ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rd...@us...> - 2009-03-21 20:58:52
|
Revision: 1990 http://digir.svn.sourceforge.net/digir/?rev=1990&view=rev Author: rdg Date: 2009-03-21 20:58:50 +0000 (Sat, 21 Mar 2009) Log Message: ----------- Tagged release 0.7.0. Added Paths: ----------- tapirlink/tags/release-0.7.0/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rd...@us...> - 2009-03-21 20:55:11
|
Revision: 1989 http://digir.svn.sourceforge.net/digir/?rev=1989&view=rev Author: rdg Date: 2009-03-21 20:55:09 +0000 (Sat, 21 Mar 2009) Log Message: ----------- Fixed misspellings. Modified Paths: -------------- tapirlink/trunk/ChangeLog.txt Modified: tapirlink/trunk/ChangeLog.txt =================================================================== --- tapirlink/trunk/ChangeLog.txt 2009-03-21 20:29:29 UTC (rev 1988) +++ tapirlink/trunk/ChangeLog.txt 2009-03-21 20:55:09 UTC (rev 1989) @@ -4,8 +4,8 @@ * New admin program to check the database encoding configuration. * Check each piece of content that comes from the database - (in search or inventory responses) to avoid wrong charset convertions that - may produce invalid XML. Convertion problems could happen when the database + (in search or inventory responses) to avoid wrong charset conversions that + may produce invalid XML. Conversion problems could happen when the database charset was incorrectly configured or if the database content somehow didn't follow the expected (real) database encoding. * Added support for mixed content elements, allowing TapirLink to be exchange @@ -19,7 +19,7 @@ * When a search returns no content and the envelope is turned off, TapirLink now returns HTTP 204 (No Content). * Added support to "IN" operator in KVP filters. - * New TP_DIAG_LEVEL option can be used to control disgnostics display. + * New TP_DIAG_LEVEL option can be used to control diagnostics display. * Fixed bug when importing DiGIR configuration (resource entity was not being imported and all contacts were accumulating in the host entity across different resources). This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rd...@us...> - 2009-03-21 20:29:33
|
Revision: 1988 http://digir.svn.sourceforge.net/digir/?rev=1988&view=rev Author: rdg Date: 2009-03-21 20:29:29 +0000 (Sat, 21 Mar 2009) Log Message: ----------- Updated release info. Modified Paths: -------------- tapirlink/trunk/ChangeLog.txt tapirlink/trunk/www/tapir_globals.php Modified: tapirlink/trunk/ChangeLog.txt =================================================================== --- tapirlink/trunk/ChangeLog.txt 2009-03-21 20:28:01 UTC (rev 1987) +++ tapirlink/trunk/ChangeLog.txt 2009-03-21 20:29:29 UTC (rev 1988) @@ -1,6 +1,6 @@ -Release 0.7.0 (?) +Release 0.7.0 (2009-03-21) -------------------------- -(revision ?) +(revision 1988) * New admin program to check the database encoding configuration. * Check each piece of content that comes from the database Modified: tapirlink/trunk/www/tapir_globals.php =================================================================== --- tapirlink/trunk/www/tapir_globals.php 2009-03-21 20:28:01 UTC (rev 1987) +++ tapirlink/trunk/www/tapir_globals.php 2009-03-21 20:29:29 UTC (rev 1988) @@ -562,6 +562,7 @@ define( 'TP_MIN_PHP_VERSION', '4.2.3' ); define( 'TP_VERSION', '0.7.0' ); + $revision = '$Revision$.'; $revision_regexp = '/^\$'.'Revision:\s(\d+)\s\$\.$/'; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rd...@us...> - 2009-03-21 20:28:05
|
Revision: 1987 http://digir.svn.sourceforge.net/digir/?rev=1987&view=rev Author: rdg Date: 2009-03-21 20:28:01 +0000 (Sat, 21 Mar 2009) Log Message: ----------- Forced change in revision number. Modified Paths: -------------- tapirlink/trunk/www/tapir_globals.php Modified: tapirlink/trunk/www/tapir_globals.php =================================================================== --- tapirlink/trunk/www/tapir_globals.php 2009-03-21 20:27:22 UTC (rev 1986) +++ tapirlink/trunk/www/tapir_globals.php 2009-03-21 20:28:01 UTC (rev 1987) @@ -562,7 +562,6 @@ define( 'TP_MIN_PHP_VERSION', '4.2.3' ); define( 'TP_VERSION', '0.7.0' ); - $revision = '$Revision$.'; $revision_regexp = '/^\$'.'Revision:\s(\d+)\s\$\.$/'; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rd...@us...> - 2009-03-21 20:27:34
|
Revision: 1986 http://digir.svn.sourceforge.net/digir/?rev=1986&view=rev Author: rdg Date: 2009-03-21 20:27:22 +0000 (Sat, 21 Mar 2009) Log Message: ----------- Added new metadata field for entity type. Modified Paths: -------------- tapirlink/trunk/classes/TpEntity.php tapirlink/trunk/classes/TpMetadataForm.php tapirlink/trunk/classes/TpResourceMetadata.php tapirlink/trunk/templates/TpMetadataForm.tmpl.php Modified: tapirlink/trunk/classes/TpEntity.php =================================================================== --- tapirlink/trunk/classes/TpEntity.php 2009-03-21 20:26:36 UTC (rev 1985) +++ tapirlink/trunk/classes/TpEntity.php 2009-03-21 20:27:22 UTC (rev 1986) @@ -31,6 +31,7 @@ class TpEntity extends TpBusinessObject { var $mIdentifier = ''; + var $mType; var $mNames; var $mAcronym; var $mLogoUrl; @@ -53,8 +54,9 @@ } // end of member function TpEntity - function LoadDefaults( ) + function LoadDefaults( ) { + $this->SetType( 'organization' ); $this->AddName( '', '' ); $this->AddDescription( '', '' ); @@ -70,6 +72,8 @@ { $this->mIdentifier = TpUtils::GetVar( $prefix.'_id', '' ); + $this->mType = TpUtils::GetVar( $prefix.'_type', '' ); + $this->LoadLangElementFromSession( $prefix.'_name', $this->mNames ); $this->mAcronym = TpUtils::GetVar( $prefix.'_acronym', '' ); @@ -171,6 +175,18 @@ } // end of member function SetIdentifier + function GetType( ) + { + return $this->mType; + + } // end of member function GetType + + function SetType( $type ) + { + $this->mType = $type; + + } // end of member function SetType + function GetNames( ) { return $this->mNames; @@ -379,8 +395,15 @@ $indent1 = $offset.$indentWith; $indent2 = $offset.$indentWith.$indentWith; - $xml = TpUtils::OpenTag( '', 'entity', $offset ); + $attrs = array(); + if ( ! empty( $this->mType ) ) + { + $attrs['type'] = $this->mType; + } + + $xml = TpUtils::OpenTag( '', 'entity', $offset, $attrs ); + $xml .= TpUtils::MakeTag( '', 'identifier', $this->mIdentifier, $indent1 ); foreach ( $this->mNames as $lang_string ) Modified: tapirlink/trunk/classes/TpMetadataForm.php =================================================================== --- tapirlink/trunk/classes/TpMetadataForm.php 2009-03-21 20:26:36 UTC (rev 1985) +++ tapirlink/trunk/classes/TpMetadataForm.php 2009-03-21 20:27:22 UTC (rev 1986) @@ -283,6 +283,11 @@ 'of a standard, just put the name or acronym or create '. 'some identifier.'; } + else if ( $labelId == 'entityType') + { + $label = 'Type'; + $doc = 'Entity type (person or organization).'; + } else if ( $labelId == 'acronym') { $label = 'Acronym'; @@ -445,6 +450,11 @@ $options = array('data supplier' => 'Data Supplier', 'technical host' => 'Technical Host'); } + else if ( $id == 'entityType') + { + $options = array('organization' => 'Organization', + 'person' => 'Person'); + } else if ( $id == 'contactRoles') { $options = array('data administrator' => 'Data Administrator', Modified: tapirlink/trunk/classes/TpResourceMetadata.php =================================================================== --- tapirlink/trunk/classes/TpResourceMetadata.php 2009-03-21 20:26:36 UTC (rev 1985) +++ tapirlink/trunk/classes/TpResourceMetadata.php 2009-03-21 20:27:22 UTC (rev 1986) @@ -275,7 +275,15 @@ else if ( strcasecmp( $name, 'entity' ) == 0 ) { $r_related_entity =& $this->GetLastRelatedEntity(); - $r_related_entity->SetEntity( new TpEntity() ); + + $entity = new TpEntity(); + + if ( isset( $attrs['type'] ) ) + { + $entity->SetType( $attrs['type'] ); + } + + $r_related_entity->SetEntity( $entity ); } else if ( strcasecmp( $name, 'hasContact' ) == 0 ) { Modified: tapirlink/trunk/templates/TpMetadataForm.tmpl.php =================================================================== --- tapirlink/trunk/templates/TpMetadataForm.tmpl.php 2009-03-21 20:26:36 UTC (rev 1985) +++ tapirlink/trunk/templates/TpMetadataForm.tmpl.php 2009-03-21 20:27:22 UTC (rev 1986) @@ -119,6 +119,10 @@ <?php print($this->GetHtmlLabel('entityId',true)); ?> <input type="text" name="<?php print($entity_prefix); ?>_id" value="<?php print($entity->GetIdentifier()); ?>" size="60"/> <br/><br/> +<!-- entity type --> +<?php print($this->GetHtmlLabel('entityType',true)); ?> +<?php print(TpHtmlUtils::GetCombo($entity_prefix.'_type',$entity->GetType(),$this->GetOptions('entityType'))); ?> +<br/><br/> <!-- entity names --> <div class="box2" align="left"> <?php print($this->GetHtmlLabel('entityName',true)); ?><br/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rd...@us...> - 2009-03-21 20:26:45
|
Revision: 1985 http://digir.svn.sourceforge.net/digir/?rev=1985&view=rev Author: rdg Date: 2009-03-21 20:26:36 +0000 (Sat, 21 Mar 2009) Log Message: ----------- Added support to the new <rootElement> feature in output model definitions. Modified Paths: -------------- tapirlink/trunk/ChangeLog.txt tapirlink/trunk/classes/TpOutputModel.php tapirlink/trunk/classes/TpSchemaInspector.php tapirlink/trunk/classes/TpXmlGenerator.php Modified: tapirlink/trunk/ChangeLog.txt =================================================================== --- tapirlink/trunk/ChangeLog.txt 2009-03-21 20:25:04 UTC (rev 1984) +++ tapirlink/trunk/ChangeLog.txt 2009-03-21 20:26:36 UTC (rev 1985) @@ -25,8 +25,9 @@ different resources). * Replaced XML schema location used in responses with: http://rs.tdwg.org/tapir/1.0/schema/tdwg_tapir.xsd - * Added new metadata fields: region code, country code and zip code. + * Added new metadata fields: entity type, region code, country code and zip code. * Fixed bug when deserializing bibliographic citation. + * Added support to the new <rootElement> feature in output model definitions. Release 0.6.1 (2008-08-01) -------------------------- Modified: tapirlink/trunk/classes/TpOutputModel.php =================================================================== --- tapirlink/trunk/classes/TpOutputModel.php 2009-03-21 20:25:04 UTC (rev 1984) +++ tapirlink/trunk/classes/TpOutputModel.php 2009-03-21 20:26:36 UTC (rev 1985) @@ -35,6 +35,7 @@ var $mLabel; var $mDocumentation; var $mLocation; + var $mRootElement; var $mIndexingElement; var $mMapping = array(); // node path => array of TpExpression var $mAutomapping = false; @@ -133,6 +134,19 @@ { $g_dlog->debug( '[Response Structure]' ); } + // <rootElement> + else if ( strcasecmp( $name, 'rootElement' ) == 0 ) + { + if ( isset( $attrs['name'] ) ) + { + $this->mRootElement = $attrs['name']; + } + else + { + $error = 'Missing attribute "name" in <rootElement>'; + TpDiagnostics::Append( DC_INVALID_REQUEST, $error, DIAG_ERROR ); + } + } // <indexingElement> else if ( strcasecmp( $name, 'indexingElement' ) == 0 ) { @@ -434,6 +448,12 @@ } // end of member function GetDocumentation + function GetRootElement( ) + { + return $this->mRootElement; + + } // end of member function GetRootElement + function GetIndexingElement( ) { return $this->mIndexingElement; @@ -594,8 +614,8 @@ */ function __sleep() { - return array( 'mRevision', 'mLocation', 'mIndexingElement', 'mMapping', - 'mAutomapping', 'mResponseStructure', 'mNamespaces' ); + return array( 'mRevision', 'mLocation', 'mRootElement', 'mIndexingElement', + 'mMapping', 'mAutomapping', 'mResponseStructure', 'mNamespaces' ); } // end of member function __sleep Modified: tapirlink/trunk/classes/TpSchemaInspector.php =================================================================== --- tapirlink/trunk/classes/TpSchemaInspector.php 2009-03-21 20:25:04 UTC (rev 1984) +++ tapirlink/trunk/classes/TpSchemaInspector.php 2009-03-21 20:26:36 UTC (rev 1985) @@ -91,34 +91,85 @@ } else { + $found_root = false; + $lacks_concrete = true; $ns = $this->mrResponseStructure->GetTargetNamespace(); + $root_element = $this->mrOutputModel->GetRootElement(); + foreach ( $global_elements as $el_name => $xs_element_decl ) { - if ( ! $xs_element_decl->IsAbstract() ) + if ( ! empty( $root_element ) ) { - $lacks_concrete = false; + $ref_name = $el_name; - // First "concrete" global element declaration - $r_xs_element_decl =& $this->mrResponseStructure->GetElementDecl( $ns, $el_name ); - $r_xs_element_decl->Accept( $this, $path ); + $prefix = $this->mrOutputModel->GetPrefix( $xs_element_decl->GetTargetNamespace() ); - break; + if ( ! empty( $prefix ) ) + { + $ref_name = $prefix.':'.$ref_name; + } + + if ( $root_element == $ref_name ) + { + if ( $xs_element_decl->IsAbstract() ) + { + $error = 'Root element is abstract'; + TpDiagnostics::Append( DC_INVALID_REQUEST, $error, DIAG_ERROR ); + + $this->_ActivateAbort(); + + return; + } + + $found_root = true; + $lacks_concrete = false; + + $r_xs_element_decl =& $this->mrResponseStructure->GetElementDecl( $ns, $el_name ); + $r_xs_element_decl->Accept( $this, $path ); + + break; + } } + else { + + if ( ! $xs_element_decl->IsAbstract() ) + { + $lacks_concrete = false; + + // First "concrete" global element declaration + $r_xs_element_decl =& $this->mrResponseStructure->GetElementDecl( $ns, $el_name ); + $r_xs_element_decl->Accept( $this, $path ); + + break; + } + } } - if ( $lacks_concrete ) + if ( ( ! empty( $root_element ) ) and ( ! $found_root ) ) { - $error = 'No concrete (non abstract) global element defined in '. - 'response structure'; + $error = 'Could not find the root element'; TpDiagnostics::Append( DC_INVALID_REQUEST, $error, DIAG_ERROR ); $this->_ActivateAbort(); return; } + else + { + if ( $lacks_concrete ) + { + $error = 'No concrete (non abstract) global element defined in '. + 'response structure'; + TpDiagnostics::Append( DC_INVALID_REQUEST, $error, DIAG_ERROR ); + + $this->_ActivateAbort(); + + return; + } + } } if ( ! $this->mFoundIndexingElement ) Modified: tapirlink/trunk/classes/TpXmlGenerator.php =================================================================== --- tapirlink/trunk/classes/TpXmlGenerator.php 2009-03-21 20:25:04 UTC (rev 1984) +++ tapirlink/trunk/classes/TpXmlGenerator.php 2009-03-21 20:26:36 UTC (rev 1985) @@ -71,15 +71,43 @@ $this->mrResource =& $rResource; + $root_element = $this->mrOutputModel->GetRootElement(); + $global_elements = $this->mResponseStructure->GetElementDecls(); $path = ''; + $matched = false; + // Get the first non abstract global element declaration and render it foreach ( $global_elements as $el_name => $xs_element_decl ) { - if ( ! $xs_element_decl->IsAbstract() ) + if ( ! empty( $root_element ) ) { + $ref_name = $el_name; + + $prefix = $this->mrOutputModel->GetPrefix( $xs_element_decl->GetTargetNamespace() ); + + if ( ! empty( $prefix ) ) + { + $ref_name = $prefix.':'.$ref_name; + } + + if ( $root_element == $ref_name ) + { + $matched = true; + } + } + else { + + if ( ! $xs_element_decl->IsAbstract() ) + { + $matched = true; + } + } + + if ( $matched ) { + $content = $xs_element_decl->Accept( $this, $path ); if ( count( $this->mNoContentSummary ) ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rd...@us...> - 2009-03-21 20:25:10
|
Revision: 1984 http://digir.svn.sourceforge.net/digir/?rev=1984&view=rev Author: rdg Date: 2009-03-21 20:25:04 +0000 (Sat, 21 Mar 2009) Log Message: ----------- Made error message more explicit about its origin. Modified Paths: -------------- tapirlink/trunk/www/tapir_client.php Modified: tapirlink/trunk/www/tapir_client.php =================================================================== --- tapirlink/trunk/www/tapir_client.php 2009-03-02 10:58:44 UTC (rev 1983) +++ tapirlink/trunk/www/tapir_client.php 2009-03-21 20:25:04 UTC (rev 1984) @@ -162,7 +162,7 @@ case 505: $label = 'HTTP Version Not Supported'; break; } - echo '<h1>HTTP '.$code.': '.$label.'</h1>'; + echo '<h1>Service responded with HTTP '.$code.' code: <br/>'.$label.'</h1>'; exit; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rd...@us...> - 2009-03-02 12:01:36
|
Revision: 1983 http://digir.svn.sourceforge.net/digir/?rev=1983&view=rev Author: rdg Date: 2009-03-02 10:58:44 +0000 (Mon, 02 Mar 2009) Log Message: ----------- Fixed bug when deserializing bibliographic citation. Modified Paths: -------------- tapirlink/trunk/ChangeLog.txt tapirlink/trunk/classes/TpResourceMetadata.php Modified: tapirlink/trunk/ChangeLog.txt =================================================================== --- tapirlink/trunk/ChangeLog.txt 2009-02-25 20:40:59 UTC (rev 1982) +++ tapirlink/trunk/ChangeLog.txt 2009-03-02 10:58:44 UTC (rev 1983) @@ -26,6 +26,7 @@ * Replaced XML schema location used in responses with: http://rs.tdwg.org/tapir/1.0/schema/tdwg_tapir.xsd * Added new metadata fields: region code, country code and zip code. + * Fixed bug when deserializing bibliographic citation. Release 0.6.1 (2008-08-01) -------------------------- Modified: tapirlink/trunk/classes/TpResourceMetadata.php =================================================================== --- tapirlink/trunk/classes/TpResourceMetadata.php 2009-02-25 20:40:59 UTC (rev 1982) +++ tapirlink/trunk/classes/TpResourceMetadata.php 2009-03-02 10:58:44 UTC (rev 1983) @@ -332,7 +332,7 @@ { $this->AddSubjects( trim( $this->mCharData ), $lang ); } - else if ( strcasecmp( $in_tag, TP_DC_PREFIX.':bibliographicCitation' ) == 0 ) + else if ( strcasecmp( $in_tag, TP_DCT_PREFIX.':bibliographicCitation' ) == 0 ) { $this->AddBibliographicCitation( trim( $this->mCharData ), $lang ); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rd...@us...> - 2009-02-25 20:41:11
|
Revision: 1982 http://digir.svn.sourceforge.net/digir/?rev=1982&view=rev Author: rdg Date: 2009-02-25 20:40:59 +0000 (Wed, 25 Feb 2009) Log Message: ----------- Added new metadata fields: region code, country code and zip code. Modified Paths: -------------- tapirlink/trunk/ChangeLog.txt tapirlink/trunk/classes/TpEntity.php tapirlink/trunk/classes/TpMetadataForm.php tapirlink/trunk/classes/TpResourceMetadata.php tapirlink/trunk/templates/TpMetadataForm.tmpl.php tapirlink/trunk/www/skins/darwin/metadata.xsl tapirlink/trunk/www/skins/default/metadata.xsl Modified: tapirlink/trunk/ChangeLog.txt =================================================================== --- tapirlink/trunk/ChangeLog.txt 2009-02-25 17:27:35 UTC (rev 1981) +++ tapirlink/trunk/ChangeLog.txt 2009-02-25 20:40:59 UTC (rev 1982) @@ -25,6 +25,7 @@ different resources). * Replaced XML schema location used in responses with: http://rs.tdwg.org/tapir/1.0/schema/tdwg_tapir.xsd + * Added new metadata fields: region code, country code and zip code. Release 0.6.1 (2008-08-01) -------------------------- Modified: tapirlink/trunk/classes/TpEntity.php =================================================================== --- tapirlink/trunk/classes/TpEntity.php 2009-02-25 17:27:35 UTC (rev 1981) +++ tapirlink/trunk/classes/TpEntity.php 2009-02-25 20:40:59 UTC (rev 1982) @@ -40,6 +40,9 @@ var $mLatitude; var $mLongitude; var $mAddress; + var $mRegionCode; + var $mCountryCode; + var $mZipCode; function TpEntity( ) { @@ -77,6 +80,12 @@ $this->mAddress = TpUtils::GetVar( $prefix.'_address', '' ); + $this->mRegionCode = TpUtils::GetVar( $prefix.'_regionCode', '' ); + + $this->mCountryCode = TpUtils::GetVar( $prefix.'_countryCode', '' ); + + $this->mZipCode = TpUtils::GetVar( $prefix.'_zipCode', '' ); + $this->mRelatedInformation = urldecode( TpUtils::GetVar( $prefix.'_relatedInformation', '' ) ); $this->mLongitude = TpUtils::GetVar( $prefix.'_longitude', '' ); @@ -210,6 +219,42 @@ } // end of member function SetAddress + function GetRegionCode( ) + { + return $this->mRegionCode; + + } // end of member function GetRegionCode + + function SetRegionCode( $regionCode ) + { + $this->mRegionCode = $regionCode; + + } // end of member function SetRegionCode + + function GetCountryCode( ) + { + return $this->mCountryCode; + + } // end of member function GetCountryCode + + function SetCountryCode( $countryCode ) + { + $this->mCountryCode = $countryCode; + + } // end of member function SetCountryCode + + function GetZipCode( ) + { + return $this->mZipCode; + + } // end of member function GetZipCode + + function SetZipCode( $zipCode ) + { + $this->mZipCode = $zipCode; + + } // end of member function SetZipCode + function GetRelatedInformation( ) { return $this->mRelatedInformation; @@ -361,6 +406,21 @@ $xml .= TpUtils::MakeTag( '', 'address', $this->mAddress, $indent1 ); + if ( ! empty( $this->mRegionCode ) ) + { + $xml .= TpUtils::MakeTag( '', 'regionCode', $this->mRegionCode, $indent1 ); + } + + if ( ! empty( $this->mCountryCode ) ) + { + $xml .= TpUtils::MakeTag( '', 'countryCode', $this->mCountryCode, $indent1 ); + } + + if ( ! empty( $this->mZipCode ) ) + { + $xml .= TpUtils::MakeTag( '', 'zipCode', $this->mZipCode, $indent1 ); + } + if ( ! empty( $this->mRelatedInformation ) ) { $xml .= TpUtils::MakeTag( '', 'relatedInformation', Modified: tapirlink/trunk/classes/TpMetadataForm.php =================================================================== --- tapirlink/trunk/classes/TpMetadataForm.php 2009-02-25 17:27:35 UTC (rev 1981) +++ tapirlink/trunk/classes/TpMetadataForm.php 2009-02-25 20:40:59 UTC (rev 1982) @@ -306,8 +306,23 @@ else if ( $labelId == 'address') { $label = 'Address'; - $doc = 'Entity physical address.'; + $doc = 'Address where the entity is located. It can include street name, street number, district, city, county and other complements. Use the next fields to specify state/province, country and zip code.'; } + else if ( $labelId == 'regionCode') + { + $label = 'Region'; + $doc = 'Region (e.g., state or province) of the specified address. Use standard abbreviation accepted in the country.'; + } + else if ( $labelId == 'countryCode') + { + $label = 'Country'; + $doc = 'Country of the specified address.'; + } + else if ( $labelId == 'zipCode') + { + $label = 'Zip code'; + $doc = 'Zip or postal code of the specified address.'; + } else if ( $labelId == 'relatedInformation') { $label = 'Related information (URL)'; @@ -506,6 +521,256 @@ 'PT5H' => '5 hours', 'PT10H' => '10 hours'); } + else if ( $id == 'countryCodes') + { + $options = array('' => '---', +'AF' => 'AFGHANISTAN', +'AX' => 'ÅLAND ISLANDS', +'AL' => 'ALBANIA', +'DZ' => 'ALGERIA', +'AS' => 'AMERICAN SAMOA', +'AD' => 'ANDORRA', +'AO' => 'ANGOLA', +'AI' => 'ANGUILLA', +'AQ' => 'ANTARCTICA', +'AG' => 'ANTIGUA AND BARBUDA', +'AR' => 'ARGENTINA', +'AM' => 'ARMENIA', +'AW' => 'ARUBA', +'AU' => 'AUSTRALIA', +'AT' => 'AUSTRIA', +'AZ' => 'AZERBAIJAN', +'BS' => 'BAHAMAS', +'BH' => 'BAHRAIN', +'BD' => 'BANGLADESH', +'BB' => 'BARBADOS', +'BY' => 'BELARUS', +'BE' => 'BELGIUM', +'BZ' => 'BELIZE', +'BJ' => 'BENIN', +'BM' => 'BERMUDA', +'BT' => 'BHUTAN', +'BO' => 'BOLIVIA', +'BA' => 'BOSNIA AND HERZEGOVINA', +'BW' => 'BOTSWANA', +'BV' => 'BOUVET ISLAND', +'BR' => 'BRAZIL', +'IO' => 'BRITISH INDIAN OCEAN TERRITORY', +'BN' => 'BRUNEI DARUSSALAM', +'BG' => 'BULGARIA', +'BF' => 'BURKINA FASO', +'BI' => 'BURUNDI', +'KH' => 'CAMBODIA', +'CM' => 'CAMEROON', +'CA' => 'CANADA', +'CV' => 'CAPE VERDE', +'KY' => 'CAYMAN ISLANDS', +'CF' => 'CENTRAL AFRICAN REPUBLIC', +'TD' => 'CHAD', +'CL' => 'CHILE', +'CN' => 'CHINA', +'CX' => 'CHRISTMAS ISLAND', +'CC' => 'COCOS (KEELING) ISLANDS', +'CO' => 'COLOMBIA', +'KM' => 'COMOROS', +'CG' => 'CONGO', +'CD' => 'CONGO, THE DEMOCRATIC REPUBLIC OF THE', +'CK' => 'COOK ISLANDS', +'CR' => 'COSTA RICA', +'CI' => 'CÔTE D\'IVOIRE', +'HR' => 'CROATIA', +'CU' => 'CUBA', +'CY' => 'CYPRUS', +'CZ' => 'CZECH REPUBLIC', +'DK' => 'DENMARK', +'DJ' => 'DJIBOUTI', +'DM' => 'DOMINICA', +'DO' => 'DOMINICAN REPUBLIC', +'EC' => 'ECUADOR', +'EG' => 'EGYPT', +'SV' => 'EL SALVADOR', +'GQ' => 'EQUATORIAL GUINEA', +'ER' => 'ERITREA', +'EE' => 'ESTONIA', +'ET' => 'ETHIOPIA', +'FK' => 'FALKLAND ISLANDS (MALVINAS)', +'FO' => 'FAROE ISLANDS', +'FJ' => 'FIJI', +'FI' => 'FINLAND', +'FR' => 'FRANCE', +'GF' => 'FRENCH GUIANA', +'PF' => 'FRENCH POLYNESIA', +'TF' => 'FRENCH SOUTHERN TERRITORIES', +'GA' => 'GABON', +'GM' => 'GAMBIA', +'GE' => 'GEORGIA', +'DE' => 'GERMANY', +'GH' => 'GHANA', +'GI' => 'GIBRALTAR', +'GR' => 'GREECE', +'GL' => 'GREENLAND', +'GD' => 'GRENADA', +'GP' => 'GUADELOUPE', +'GU' => 'GUAM', +'GT' => 'GUATEMALA', +'GG' => 'GUERNSEY', +'GN' => 'GUINEA', +'GW' => 'GUINEA-BISSAU', +'GY' => 'GUYANA', +'HT' => 'HAITI', +'HM' => 'HEARD ISLAND AND MCDONALD ISLANDS', +'VA' => 'HOLY SEE (VATICAN CITY STATE)', +'HN' => 'HONDURAS', +'HK' => 'HONG KONG', +'HU' => 'HUNGARY', +'IS' => 'ICELAND', +'IN' => 'INDIA', +'ID' => 'INDONESIA', +'IR' => 'IRAN', +'IQ' => 'IRAQ', +'IE' => 'IRELAND', +'IM' => 'ISLE OF MAN', +'IL' => 'ISRAEL', +'IT' => 'ITALY', +'JM' => 'JAMAICA', +'JP' => 'JAPAN', +'JE' => 'JERSEY', +'JO' => 'JORDAN', +'KZ' => 'KAZAKHSTAN', +'KE' => 'KENYA', +'KI' => 'KIRIBATI', +'KP' => 'KOREA, DEMOCRATIC PEOPLE\'S REPUBLIC OF', +'KR' => 'KOREA, REPUBLIC OF', +'KW' => 'KUWAIT', +'KG' => 'KYRGYZSTAN', +'LA' => 'LAO', +'LV' => 'LATVIA', +'LB' => 'LEBANON', +'LS' => 'LESOTHO', +'LR' => 'LIBERIA', +'LY' => 'LIBYAN ARAB JAMAHIRIYA', +'LI' => 'LIECHTENSTEIN', +'LT' => 'LITHUANIA', +'LU' => 'LUXEMBOURG', +'MO' => 'MACAO', +'MK' => 'MACEDONIA', +'MG' => 'MADAGASCAR', +'MW' => 'MALAWI', +'MY' => 'MALAYSIA', +'MV' => 'MALDIVES', +'ML' => 'MALI', +'MT' => 'MALTA', +'MH' => 'MARSHALL ISLANDS', +'MQ' => 'MARTINIQUE', +'MR' => 'MAURITANIA', +'MU' => 'MAURITIUS', +'YT' => 'MAYOTTE', +'MX' => 'MEXICO', +'FM' => 'MICRONESIA', +'MD' => 'MOLDOVA', +'MC' => 'MONACO', +'MN' => 'MONGOLIA', +'ME' => 'MONTENEGRO', +'MS' => 'MONTSERRAT', +'MA' => 'MOROCCO', +'MZ' => 'MOZAMBIQUE', +'MM' => 'MYANMAR', +'NA' => 'NAMIBIA', +'NR' => 'NAURU', +'NP' => 'NEPAL', +'NL' => 'NETHERLANDS', +'AN' => 'NETHERLANDS ANTILLES', +'NC' => 'NEW CALEDONIA', +'NZ' => 'NEW ZEALAND', +'NI' => 'NICARAGUA', +'NE' => 'NIGER', +'NG' => 'NIGERIA', +'NU' => 'NIUE', +'NF' => 'NORFOLK ISLAND', +'MP' => 'NORTHERN MARIANA ISLANDS', +'NO' => 'NORWAY', +'OM' => 'OMAN', +'PK' => 'PAKISTAN', +'PW' => 'PALAU', +'PS' => 'PALESTINIAN TERRITORY, OCCUPIED', +'PA' => 'PANAMA', +'PG' => 'PAPUA NEW GUINEA', +'PY' => 'PARAGUAY', +'PE' => 'PERU', +'PH' => 'PHILIPPINES', +'PN' => 'PITCAIRN', +'PL' => 'POLAND', +'PT' => 'PORTUGAL', +'PR' => 'PUERTO RICO', +'QA' => 'QATAR', +'RE' => 'RÉUNION', +'RO' => 'ROMANIA', +'RU' => 'RUSSIAN FEDERATION', +'RW' => 'RWANDA', +'BL' => 'SAINT BARTHÉLEMY', +'SH' => 'SAINT HELENA', +'KN' => 'SAINT KITTS AND NEVIS', +'LC' => 'SAINT LUCIA', +'MF' => 'SAINT MARTIN', +'PM' => 'SAINT PIERRE AND MIQUELON', +'VC' => 'SAINT VINCENT AND THE GRENADINES', +'WS' => 'SAMOA', +'SM' => 'SAN MARINO', +'ST' => 'SAO TOME AND PRINCIPE', +'SA' => 'SAUDI ARABIA', +'SN' => 'SENEGAL', +'RS' => 'SERBIA', +'SC' => 'SEYCHELLES', +'SL' => 'SIERRA LEONE', +'SG' => 'SINGAPORE', +'SK' => 'SLOVAKIA', +'SI' => 'SLOVENIA', +'SB' => 'SOLOMON ISLANDS', +'SO' => 'SOMALIA', +'ZA' => 'SOUTH AFRICA', +'GS' => 'SOUTH GEORGIA AND THE SOUTH SANDWICH ISLANDS', +'ES' => 'SPAIN', +'LK' => 'SRI LANKA', +'SD' => 'SUDAN', +'SR' => 'SURINAME', +'SJ' => 'SVALBARD AND JAN MAYEN', +'SZ' => 'SWAZILAND', +'SE' => 'SWEDEN', +'CH' => 'SWITZERLAND', +'SY' => 'SYRIAN ARAB REPUBLIC', +'TW' => 'TAIWAN, PROVINCE OF CHINA', +'TJ' => 'TAJIKISTAN', +'TZ' => 'TANZANIA', +'TH' => 'THAILAND', +'TL' => 'TIMOR-LESTE', +'TG' => 'TOGO', +'TK' => 'TOKELAU', +'TO' => 'TONGA', +'TT' => 'TRINIDAD AND TOBAGO', +'TN' => 'TUNISIA', +'TR' => 'TURKEY', +'TM' => 'TURKMENISTAN', +'TC' => 'TURKS AND CAICOS ISLANDS', +'TV' => 'TUVALU', +'UG' => 'UGANDA', +'UA' => 'UKRAINE', +'AE' => 'UNITED ARAB EMIRATES', +'GB' => 'UNITED KINGDOM', +'US' => 'UNITED STATES', +'UM' => 'UNITED STATES MINOR OUTLYING ISLANDS', +'UY' => 'URUGUAY', +'UZ' => 'UZBEKISTAN', +'VU' => 'VANUATU', +'VE' => 'VENEZUELA', +'VN' => 'VIET NAM', +'VG' => 'VIRGIN ISLANDS, BRITISH', +'VI' => 'VIRGIN ISLANDS, U.S.', +'WF' => 'WALLIS AND FUTUNA', +'EH' => 'WESTERN SAHARA', +'YE' => 'YEMEN', +'ZM' => 'ZAMBIA', +'ZW' => 'ZIMBABWE'); + } return $options; Modified: tapirlink/trunk/classes/TpResourceMetadata.php =================================================================== --- tapirlink/trunk/classes/TpResourceMetadata.php 2009-02-25 17:27:35 UTC (rev 1981) +++ tapirlink/trunk/classes/TpResourceMetadata.php 2009-02-25 20:40:59 UTC (rev 1982) @@ -390,6 +390,18 @@ { $r_entity->SetAddress( trim( $this->mCharData ) ); } + else if ( strcasecmp( $in_tag, 'regionCode' ) == 0 ) + { + $r_entity->SetRegionCode( trim( $this->mCharData ) ); + } + else if ( strcasecmp( $in_tag, 'countryCode' ) == 0 ) + { + $r_entity->SetCountryCode( trim( $this->mCharData ) ); + } + else if ( strcasecmp( $in_tag, 'zipCode' ) == 0 ) + { + $r_entity->SetZipCode( trim( $this->mCharData ) ); + } else if ( strcasecmp( $in_tag, 'logoURL' ) == 0 ) { $r_entity->SetLogoUrl( trim( $this->mCharData ) ); Modified: tapirlink/trunk/templates/TpMetadataForm.tmpl.php =================================================================== --- tapirlink/trunk/templates/TpMetadataForm.tmpl.php 2009-02-25 17:27:35 UTC (rev 1981) +++ tapirlink/trunk/templates/TpMetadataForm.tmpl.php 2009-02-25 20:40:59 UTC (rev 1982) @@ -156,6 +156,15 @@ <br/> <textarea name="<?php print($entity_prefix); ?>_address" rows="2" cols="<?php print($textarea_cols); ?>" wrap="soft"><?php print($entity->GetAddress()); ?></textarea> <br/> +<br/> +<?php print($this->GetHtmlLabel('regionCode',false)); ?> +<input type="text" name="<?php print($entity_prefix); ?>_regionCode" value="<?php print($entity->GetRegionCode()); ?>" size="5"/> +<?php print($this->GetHtmlLabel('countryCode',false)); ?> +<?php print(TpHtmlUtils::GetCombo($entity_prefix.'_countryCode',$entity->GetCountryCode(),$this->GetOptions('countryCodes'))); ?> +<br/> +<br/> +<?php print($this->GetHtmlLabel('zipCode',false)); ?> +<input type="text" name="<?php print($entity_prefix); ?>_zipCode" value="<?php print($entity->GetZipCode()); ?>" size="10"/> <!-- entity coordinates --> <?php print($this->GetHtmlLabel('longitude',false)); ?> <input type="text" name="<?php print($entity_prefix); ?>_longitude" value="<?php print($entity->GetLongitude()); ?>" size="12"/> Modified: tapirlink/trunk/www/skins/darwin/metadata.xsl =================================================================== --- tapirlink/trunk/www/skins/darwin/metadata.xsl 2009-02-25 17:27:35 UTC (rev 1981) +++ tapirlink/trunk/www/skins/darwin/metadata.xsl 2009-02-25 20:40:59 UTC (rev 1982) @@ -76,7 +76,7 @@ </xsl:for-each><br/> <br/> - <span class="SubLabel">Address</span><br/><span class="RegularText"><xsl:value-of select="tapir:entity/tapir:address"/><xsl:if test="tapir:entity/geo:Point"><br/>(lat: <xsl:value-of select="tapir:entity/geo:Point/geo:lat"/>, long: <xsl:value-of select="tapir:entity/geo:Point/geo:long"/>)</xsl:if></span><br/> + <span class="SubLabel">Address</span><br/><span class="RegularText"><xsl:value-of select="tapir:entity/tapir:address"/><xsl:if test="tapir:entity/tapir:regionCode">, <xsl:value-of select="tapir:entity/tapir:regionCode"/></xsl:if><xsl:if test="tapir:entity/tapir:countryCode">, <xsl:value-of select="tapir:entity/tapir:countryCode"/></xsl:if><xsl:if test="tapir:entity/geo:Point"><br/>(lat: <xsl:value-of select="tapir:entity/geo:Point/geo:lat"/>, long: <xsl:value-of select="tapir:entity/geo:Point/geo:long"/>)</xsl:if></span><br/> <br/> <span class="SubLabel">Contacts</span><br/> Modified: tapirlink/trunk/www/skins/default/metadata.xsl =================================================================== --- tapirlink/trunk/www/skins/default/metadata.xsl 2009-02-25 17:27:35 UTC (rev 1981) +++ tapirlink/trunk/www/skins/default/metadata.xsl 2009-02-25 20:40:59 UTC (rev 1982) @@ -76,7 +76,7 @@ </xsl:for-each><br/> <br/> - <span class="SubLabel">Address</span><br/><span class="RegularText"><xsl:value-of select="tapir:entity/tapir:address"/><xsl:if test="tapir:entity/geo:Point"><br/>(lat: <xsl:value-of select="tapir:entity/geo:Point/geo:lat"/>, long: <xsl:value-of select="tapir:entity/geo:Point/geo:long"/>)</xsl:if></span><br/> + <span class="SubLabel">Address</span><br/><span class="RegularText"><xsl:value-of select="tapir:entity/tapir:address"/><xsl:if test="tapir:entity/tapir:regionCode">, <xsl:value-of select="tapir:entity/tapir:regionCode"/></xsl:if><xsl:if test="tapir:entity/tapir:countryCode">, <xsl:value-of select="tapir:entity/tapir:countryCode"/></xsl:if><xsl:if test="tapir:entity/geo:Point"><br/>(lat: <xsl:value-of select="tapir:entity/geo:Point/geo:lat"/>, long: <xsl:value-of select="tapir:entity/geo:Point/geo:long"/>)</xsl:if></span><br/> <br/> <span class="SubLabel">Contacts</span><br/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rd...@us...> - 2009-02-25 17:28:00
|
Revision: 1981 http://digir.svn.sourceforge.net/digir/?rev=1981&view=rev Author: rdg Date: 2009-02-25 17:27:35 +0000 (Wed, 25 Feb 2009) Log Message: ----------- Replaced XML schema location used in responses with the official one mentioned in the spec. Modified Paths: -------------- tapirlink/trunk/ChangeLog.txt tapirlink/trunk/www/tapir_globals.php Modified: tapirlink/trunk/ChangeLog.txt =================================================================== --- tapirlink/trunk/ChangeLog.txt 2009-02-25 17:12:53 UTC (rev 1980) +++ tapirlink/trunk/ChangeLog.txt 2009-02-25 17:27:35 UTC (rev 1981) @@ -20,6 +20,11 @@ now returns HTTP 204 (No Content). * Added support to "IN" operator in KVP filters. * New TP_DIAG_LEVEL option can be used to control disgnostics display. + * Fixed bug when importing DiGIR configuration (resource entity was not being + imported and all contacts were accumulating in the host entity across + different resources). + * Replaced XML schema location used in responses with: + http://rs.tdwg.org/tapir/1.0/schema/tdwg_tapir.xsd Release 0.6.1 (2008-08-01) -------------------------- Modified: tapirlink/trunk/www/tapir_globals.php =================================================================== --- tapirlink/trunk/www/tapir_globals.php 2009-02-25 17:12:53 UTC (rev 1980) +++ tapirlink/trunk/www/tapir_globals.php 2009-02-25 17:27:35 UTC (rev 1981) @@ -575,7 +575,7 @@ define( 'TP_REVISION', $revision ); define( 'TP_NAMESPACE','http://rs.tdwg.org/tapir/1.0' ); -define( 'TP_SCHEMA_LOCATION','http://rs.tdwg.org/tapir/1.0/schema/tapir.xsd' ); +define( 'TP_SCHEMA_LOCATION','http://rs.tdwg.org/tapir/1.0/schema/tdwg_tapir.xsd' ); define( 'XMLSCHEMANS','http://www.w3.org/2001/XMLSchema' ); define( 'XMLSCHEMAINST','http://www.w3.org/2001/XMLSchema-instance' ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rd...@us...> - 2009-02-25 17:13:23
|
Revision: 1980 http://digir.svn.sourceforge.net/digir/?rev=1980&view=rev Author: rdg Date: 2009-02-25 17:12:53 +0000 (Wed, 25 Feb 2009) Log Message: ----------- Updated xml schema file for validation against the latest protocol version. Modified Paths: -------------- tapirtester/trunk/www/index.php tapirtester/trunk/www/schemas/tapir.xsd Modified: tapirtester/trunk/www/index.php =================================================================== --- tapirtester/trunk/www/index.php 2009-02-25 14:22:41 UTC (rev 1979) +++ tapirtester/trunk/www/index.php 2009-02-25 17:12:53 UTC (rev 1980) @@ -52,7 +52,7 @@ require_once('simpletest/xml.php'); // TapirTester version -$version = '0.6.6'; +$version = '0.7.0'; // Available test suites $test_suites = parse_ini_file( '../config/test_suites.ini', true ); Modified: tapirtester/trunk/www/schemas/tapir.xsd =================================================================== --- tapirtester/trunk/www/schemas/tapir.xsd 2009-02-25 14:22:41 UTC (rev 1979) +++ tapirtester/trunk/www/schemas/tapir.xsd 2009-02-25 17:12:53 UTC (rev 1980) @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!-- $Id: tapir.xsd 1379 2008-04-09 22:21:43Z RenatoDeGiovanni $ --> +<!-- $Id: tapir.xsd 1440 2009-02-05 09:53:33Z RenatoDeGiovanni $ --> <xsd:schema targetNamespace="http://rs.tdwg.org/tapir/1.0" xmlns="http://rs.tdwg.org/tapir/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema" @@ -8,7 +8,7 @@ xmlns:geo="http://www.w3.org/2003/01/geo/wgs84_pos#" xmlns:vcard="http://www.w3.org/2001/vcard-rdf/3.0#" elementFormDefault="qualified" - attributeFormDefault="unqualified" version="1.0.7" xml:lang="EN" > + attributeFormDefault="unqualified" version="1.0.8" xml:lang="EN" > <xsd:annotation> <xsd:documentation xml:lang="en"> TAPIR XML Schema. TAPIR is an acronym for TDWG Access Protocol for Information Retrieval. @@ -252,6 +252,15 @@ </xsd:choice> </xsd:complexType> </xsd:element> + <xsd:element name="rootElement" minOccurs="0"> + <xsd:annotation> + <xsd:documentation>Name of a global element that should be the root element in + search responses. When not specified, the first global element should be used.</xsd:documentation> + </xsd:annotation> + <xsd:complexType> + <xsd:attribute name="name" type="xsd:string" use="required"/> + </xsd:complexType> + </xsd:element> <xsd:element name="indexingElement"> <xsd:annotation> <xsd:documentation>A simple XPath pointing to a response structure node that @@ -324,30 +333,6 @@ <xsd:element name="externalOutputModel" type="externalResourceType"></xsd:element> <xsd:element name="outputModel" type="outputModelType"></xsd:element> </xsd:choice> - <xsd:element name="partial" minOccurs="0"> - <xsd:annotation> - <xsd:documentation>Select only a subset of the - entire response structure to be used in the - response. Useful for working with large cached - external structures referenced via URLs. Select - branch nodes if you want all concepts below - included. A partial search must take care that - response documents still validate. Thus - mandatory elements or attributes of the response - structure, which are not listed in the partial - search ,must be included in the response - content.</xsd:documentation> - </xsd:annotation> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="node" type="nodeReferenceType" maxOccurs="unbounded"> - <xsd:annotation> - <xsd:documentation>A node taken from the response structure definition.</xsd:documentation> - </xsd:annotation> - </xsd:element> - </xsd:sequence> - </xsd:complexType> - </xsd:element> <xsd:element ref="filter" minOccurs="0"/> <xsd:element name="orderBy" minOccurs="0"> <xsd:annotation> @@ -833,7 +818,6 @@ <xsd:attributeGroup ref="globalParametersGroup"/> <xsd:attributeGroup ref="pagingParametersGroup"/> <xsd:attribute name="envelope" type="xsd:boolean" use="optional" default="true"/> - <xsd:attribute name="omit-ns" type="xsd:boolean" use="optional" default="false"/> </xsd:complexType> </xsd:element> </xsd:choice> @@ -841,7 +825,6 @@ </xsd:complexType> <xsd:attributeGroup name="globalParametersGroup"> <xsd:attribute name="xslt" type="xsd:anyURI" use="optional"/> - <xsd:attribute name="xslt-apply" type="xsd:boolean" use="optional" default="false"/> <xsd:attribute name="log-only" type="xsd:boolean" use="optional" default="false"/> </xsd:attributeGroup> <xsd:attributeGroup name="pagingParametersGroup"> @@ -970,6 +953,7 @@ </xsd:sequence> </xsd:complexType> </xsd:element> + <xsd:element ref="custom" minOccurs="0"/> </xsd:sequence> </xsd:complexType> </xsd:element> @@ -996,7 +980,6 @@ </xsd:restriction> </xsd:simpleType> </xsd:element> - <xsd:element name="xlst" minOccurs="0"><xsd:complexType/></xsd:element> </xsd:sequence> </xsd:complexType> </xsd:element> @@ -1123,9 +1106,41 @@ </xsd:sequence> </xsd:complexType> </xsd:element> + <xsd:element name="archives" minOccurs="0"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="archive"> + <xsd:complexType> + <xsd:attribute name="format" type="archiveFormatExtensionType" use="required"/> + <xsd:attribute name="location" type="xsd:anyURI" use="required"/> + <xsd:attribute name="creation" type="xsd:dateTime" use="required"/> + <xsd:attribute name="compression" type="archiveCompressionExtensionType" use="optional"/> + <xsd:attribute name="numberOfRecords" type="xsd:int" use="required"/> + <xsd:attribute name="outputModel" type="xsd:anyURI" use="optional"/> + </xsd:complexType> + </xsd:element> + </xsd:sequence> + </xsd:complexType> + </xsd:element> <xsd:element ref="custom" minOccurs="0"/> </xsd:sequence> </xsd:complexType> + <xsd:simpleType name="archiveFormatType"> + <xsd:restriction base="xsd:string"> + <xsd:enumeration value="xml"/> + </xsd:restriction> + </xsd:simpleType> + <xsd:simpleType name="archiveFormatExtensionType"> + <xsd:union memberTypes="archiveFormatType xsd:string"/> + </xsd:simpleType> + <xsd:simpleType name="archiveCompressionType"> + <xsd:restriction base="xsd:string"> + <xsd:enumeration value="gzip"/> + </xsd:restriction> + </xsd:simpleType> + <xsd:simpleType name="archiveCompressionExtensionType"> + <xsd:union memberTypes="archiveCompressionType xsd:string"/> + </xsd:simpleType> <xsd:complexType name="templatesCapabilitiesType"> <xsd:sequence> <xsd:element name="template" maxOccurs="unbounded"> @@ -1739,7 +1754,26 @@ languages.</xsd:documentation> </xsd:annotation> </xsd:element> - <xsd:element name="address" type="xsd:string" minOccurs="0"/> + <xsd:element name="address" type="xsd:string" minOccurs="0"> + <xsd:annotation> + <xsd:documentation>Address where the entity is located. It can include street name, street number, district, city, county and other complements. Use the next elements to specify state/province, country and zip code.</xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="regionCode" type="xsd:string" minOccurs="0"> + <xsd:annotation> + <xsd:documentation>Region (e.g., state or province) of the specified address. Use standard abbreviation accepted in the country.</xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="countryCode" type="xsd:string" minOccurs="0"> + <xsd:annotation> + <xsd:documentation>Country code (ISO 3166-1-alpha-2 code) of the specified address.</xsd:documentation> + </xsd:annotation> + </xsd:element> + <xsd:element name="zipCode" type="xsd:string" minOccurs="0"> + <xsd:annotation> + <xsd:documentation>Zip or postal code of the specified address.</xsd:documentation> + </xsd:annotation> + </xsd:element> <xsd:element name="relatedInformation" type="xsd:anyURI" minOccurs="0" maxOccurs="unbounded"> <xsd:annotation> <xsd:documentation>Other related information about this entity found at the @@ -1762,6 +1796,14 @@ </xsd:element> <xsd:element ref="custom" minOccurs="0"/> </xsd:sequence> + <xsd:attribute name="type" use="optional" default="organization"> + <xsd:simpleType> + <xsd:restriction base="xsd:string"> + <xsd:enumeration value="organization"/> + <xsd:enumeration value="person"/> + </xsd:restriction> + </xsd:simpleType> + </xsd:attribute> <xsd:attribute ref="xml:lang" use="optional"/> </xsd:complexType> <!-- ===== INVENTORY===== --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rd...@us...> - 2009-02-25 14:23:05
|
Revision: 1979 http://digir.svn.sourceforge.net/digir/?rev=1979&view=rev Author: rdg Date: 2009-02-25 14:22:41 +0000 (Wed, 25 Feb 2009) Log Message: ----------- Fixed bug when importing from DiGIR configuration (second related entity was not being imported and contacts were accumulating in the main host entity across different resources). Modified Paths: -------------- tapirlink/trunk/classes/TpImportForm.php Modified: tapirlink/trunk/classes/TpImportForm.php =================================================================== --- tapirlink/trunk/classes/TpImportForm.php 2009-02-13 18:03:57 UTC (rev 1978) +++ tapirlink/trunk/classes/TpImportForm.php 2009-02-25 14:22:41 UTC (rev 1979) @@ -938,12 +938,24 @@ if ( strcasecmp( $host_name, $data ) != 0 ) { $entity = new TpEntity(); + $entity->AddName( $data, '' ); $related_entity = new TpRelatedEntity(); $related_entity->AddRole( 'data supplier' ); $related_entity->SetEntity( $entity ); + + $r_metadata->AddRelatedEntity( $related_entity ); } } + // metadata/relatedInformation => resource website + else if ( strcasecmp( $in_tag, 'relatedinformation' ) == 0 ) + { + $r_last_related_entity =& $r_metadata->GetLastRelatedEntity(); + + $r_entity =& $r_last_related_entity->GetEntity(); + + $r_entity->SetRelatedInformation( $data ); + } // metadata/abstract => resource description else if ( strcasecmp( $in_tag, 'abstract' ) == 0 ) { @@ -995,10 +1007,6 @@ $r_entity =& $r_last_related_entity->GetEntity(); - $r_related_contact =& $r_entity->GetLastRelatedContact(); - - $r_contact =& $r_related_contact->GetContact(); - // contact/name => contact full name if ( strcasecmp( $in_tag, 'name' ) == 0 ) { @@ -1027,8 +1035,6 @@ $related_contact->SetContact( $contact ); - $r_entity =& $r_last_related_entity->GetEntity(); - $r_entity->AddRelatedContact( $related_contact ); } } @@ -1037,6 +1043,10 @@ { if ( $this->mNewContact ) { + $r_related_contact =& $r_entity->GetLastRelatedContact(); + + $r_contact =& $r_related_contact->GetContact(); + $r_contact->SetEmail( $data ); } } @@ -1045,6 +1055,10 @@ { if ( $this->mNewContact ) { + $r_related_contact =& $r_entity->GetLastRelatedContact(); + + $r_contact =& $r_related_contact->GetContact(); + $r_contact->SetTelephone( $data ); } } @@ -1053,6 +1067,10 @@ { if ( $this->mNewContact ) { + $r_related_contact =& $r_entity->GetLastRelatedContact(); + + $r_contact =& $r_related_contact->GetContact(); + $r_contact->AddTitle( $data, null ); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rd...@us...> - 2009-02-13 18:04:02
|
Revision: 1978 http://digir.svn.sourceforge.net/digir/?rev=1978&view=rev Author: rdg Date: 2009-02-13 18:03:57 +0000 (Fri, 13 Feb 2009) Log Message: ----------- Created dummy callback functions to avoid warnings in older PHP versions. Modified Paths: -------------- tapirlink/trunk/admin/check_update.php Modified: tapirlink/trunk/admin/check_update.php =================================================================== --- tapirlink/trunk/admin/check_update.php 2009-02-13 17:26:43 UTC (rev 1977) +++ tapirlink/trunk/admin/check_update.php 2009-02-13 18:03:57 UTC (rev 1978) @@ -45,6 +45,13 @@ } } +// This function was only created because older PHP versions through warnings +// when callbacks are NULL +function _SvnEndElement( $parser, $name ) +{ + // nothing here +} + // Internal function to handle start elements of the TapirLink remote XML function _TpStartElement( $parser, $name, $attrs ) { @@ -58,6 +65,13 @@ } } +// This function was only created because older PHP versions through warnings +// when callbacks are NULL +function _TpEndElement( $parser, $name ) +{ + // nothing here +} + ///// Main code ///// // Check if TapirLink was installed from subversion @@ -91,7 +105,7 @@ } xml_parser_set_option( $parser, XML_OPTION_CASE_FOLDING, 0 ); -xml_set_element_handler( $parser, '_SvnStartElement', NULL ); +xml_set_element_handler( $parser, '_SvnStartElement', '_SvnEndElement' ); if ( ! xml_parse( $parser, $output_svn_info ) ) { @@ -112,7 +126,7 @@ // Parse XML $parser = xml_parser_create(); xml_parser_set_option( $parser, XML_OPTION_CASE_FOLDING, 0 ); -xml_set_element_handler( $parser, '_TpStartElement', NULL ); +xml_set_element_handler( $parser, '_TpStartElement', '_TpEndElement' ); while ( $data = fread( $fh, 4096 ) ) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rd...@us...> - 2009-02-13 17:26:48
|
Revision: 1977 http://digir.svn.sourceforge.net/digir/?rev=1977&view=rev Author: rdg Date: 2009-02-13 17:26:43 +0000 (Fri, 13 Feb 2009) Log Message: ----------- Check if xml parser was correctly instantiated. Modified Paths: -------------- tapirlink/trunk/admin/check_update.php Modified: tapirlink/trunk/admin/check_update.php =================================================================== --- tapirlink/trunk/admin/check_update.php 2009-02-06 12:39:36 UTC (rev 1976) +++ tapirlink/trunk/admin/check_update.php 2009-02-13 17:26:43 UTC (rev 1977) @@ -84,6 +84,12 @@ // Parse XML to get revision $parser = xml_parser_create(); + +if ( ! is_resource( $parser ) ) +{ + die( 'Could not instantiate XML parser. Please check your PHP installation.' ); +} + xml_parser_set_option( $parser, XML_OPTION_CASE_FOLDING, 0 ); xml_set_element_handler( $parser, '_SvnStartElement', NULL ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rd...@us...> - 2009-02-06 12:39:40
|
Revision: 1976 http://digir.svn.sourceforge.net/digir/?rev=1976&view=rev Author: rdg Date: 2009-02-06 12:39:36 +0000 (Fri, 06 Feb 2009) Log Message: ----------- Minor change to help when debugging. Modified Paths: -------------- tapirlink/trunk/www/tapir_client.php Modified: tapirlink/trunk/www/tapir_client.php =================================================================== --- tapirlink/trunk/www/tapir_client.php 2009-02-06 11:22:57 UTC (rev 1975) +++ tapirlink/trunk/www/tapir_client.php 2009-02-06 12:39:36 UTC (rev 1976) @@ -106,6 +106,8 @@ // This can be used to see the entire request //$raw_request = $http_request->_buildRequest(); + //echo $raw_request; + //exit; // This can be used to inspect the HTTP header received //$header = $http_request->getResponseHeader(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rd...@us...> - 2009-02-06 11:23:04
|
Revision: 1975 http://digir.svn.sourceforge.net/digir/?rev=1975&view=rev Author: rdg Date: 2009-02-06 11:22:57 +0000 (Fri, 06 Feb 2009) Log Message: ----------- Access points can contain the question mark, so avoid using it blindly before appending parameters. Modified Paths: -------------- tapirlink/trunk/www/tapir_client.php Modified: tapirlink/trunk/www/tapir_client.php =================================================================== --- tapirlink/trunk/www/tapir_client.php 2009-02-05 19:05:16 UTC (rev 1974) +++ tapirlink/trunk/www/tapir_client.php 2009-02-06 11:22:57 UTC (rev 1975) @@ -74,7 +74,9 @@ $body = urlencode( $body ); - $url .= "?request=$body"; + $url .= ( strpos( $url, '?' ) === false ) ? '?' : '&'; + + $url .= "request=$body"; } else { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rd...@us...> - 2009-02-05 19:05:21
|
Revision: 1974 http://digir.svn.sourceforge.net/digir/?rev=1974&view=rev Author: rdg Date: 2009-02-05 19:05:16 +0000 (Thu, 05 Feb 2009) Log Message: ----------- Set timeout when making http requests in simple client. Modified Paths: -------------- tapirlink/trunk/www/tapir_client.php Modified: tapirlink/trunk/www/tapir_client.php =================================================================== --- tapirlink/trunk/www/tapir_client.php 2009-02-04 12:12:59 UTC (rev 1973) +++ tapirlink/trunk/www/tapir_client.php 2009-02-05 19:05:16 UTC (rev 1974) @@ -95,6 +95,9 @@ $http_request->setURL( $url ); + $http_request->_timeout = 30; + $http_request->_readTimeout = 30; + $res = $http_request->sendRequest(); $response = $http_request->getResponseBody(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rd...@us...> - 2009-02-04 12:22:17
|
Revision: 1972 http://digir.svn.sourceforge.net/digir/?rev=1972&view=rev Author: rdg Date: 2009-02-04 12:11:56 +0000 (Wed, 04 Feb 2009) Log Message: ----------- New TP_DIAG_LEVEL option controls diagnostic messages display. Modified Paths: -------------- tapirlink/trunk/classes/TpDiagnostics.php tapirlink/trunk/www/localconfig_dist.php tapirlink/trunk/www/tapir_errors.php tapirlink/trunk/www/tapir_globals.php Modified: tapirlink/trunk/classes/TpDiagnostics.php =================================================================== --- tapirlink/trunk/classes/TpDiagnostics.php 2009-02-04 12:10:35 UTC (rev 1971) +++ tapirlink/trunk/classes/TpDiagnostics.php 2009-02-04 12:11:56 UTC (rev 1972) @@ -22,6 +22,7 @@ * */ +require_once(dirname(__FILE__).'/../www/tapir_globals.php'); // tapir_diagnostics.php is generated by applying diag_codes_php.xslt // against diag_codes.xml require_once(dirname(__FILE__).'/../www/tapir_diagnostics.php'); @@ -58,6 +59,24 @@ */ function Append( $cd, $msg, $severity ) { + if ( $severity == DIAG_WARN and TP_DIAG_LEVEL > 2 ) + { + return; + } + + if ( $severity == DIAG_INFO and TP_DIAG_LEVEL > 1 ) + { + return; + } + + if ( $severity == DIAG_DEBUG and TP_DIAG_LEVEL > 0 ) + { + return; + } + + global $g_dlog; + $g_dlog->debug("Appending ".$severity." when level is ".TP_DIAG_LEVEL); + $stack =& TpDiagnostics::_GetStack(); array_push( $stack, new TpDiagnostic( $cd, $msg, $severity ) ); Modified: tapirlink/trunk/www/localconfig_dist.php =================================================================== --- tapirlink/trunk/www/localconfig_dist.php 2009-02-04 12:10:35 UTC (rev 1971) +++ tapirlink/trunk/www/localconfig_dist.php 2009-02-04 12:11:56 UTC (rev 1972) @@ -56,6 +56,14 @@ */ //define('TP_LOG_LEVEL', PEAR_LOG_INFO); +/* +* Indicate the minimum level of diagnostic messages to appear in responses. +* Options are: 0 (DEBUG), 1 (INFO), 2 (WARN), 3 (ERROR) +* Setting 1 (INFO) will avoid debug diagnostics, setting 2 (WARN) will avoid +* info and debug diagnostics, and so on. Deafult is 1 (INFO). +*/ +//define( 'TP_DIAG_LEVEL', 3 ); + /** * Set this true to allow incoming debug requests * (not recommended for stable installations). Modified: tapirlink/trunk/www/tapir_errors.php =================================================================== --- tapirlink/trunk/www/tapir_errors.php 2009-02-04 12:10:35 UTC (rev 1971) +++ tapirlink/trunk/www/tapir_errors.php 2009-02-04 12:11:56 UTC (rev 1972) @@ -57,16 +57,12 @@ case DIAG_ERROR: - TpDiagnostics::Append( "Error [$errNo]", - $errStr, - DIAG_ERROR ); + TpDiagnostics::Append( "Error [$errNo]", $errStr, DIAG_ERROR ); break; case DIAG_WARN: - TpDiagnostics::Append( "Warning [$errNo]", - $errStr, - DIAG_WARN ); + TpDiagnostics::Append( "Warning [$errNo]", $errStr, DIAG_WARN ); break; default: Modified: tapirlink/trunk/www/tapir_globals.php =================================================================== --- tapirlink/trunk/www/tapir_globals.php 2009-02-04 12:10:35 UTC (rev 1971) +++ tapirlink/trunk/www/tapir_globals.php 2009-02-04 12:11:56 UTC (rev 1972) @@ -437,6 +437,17 @@ } /* +* Indicate the minimum level of diagnostic messages to appear in responses. +* Options are: 0 (DEBUG), 1 (INFO), 2 (WARN), 3 (ERROR) +* Setting 1 (INFO) will avoid debug diagnostics, setting 2 (WARN) will avoid +* info and debug diagnostics, and so on. +*/ +if ( ! defined( 'TP_DIAG_LEVEL' ) ) +{ + define( 'TP_DIAG_LEVEL', 1 ); +} + +/* * Set to true if you want to track statistics */ if ( ! defined( 'TP_STATISTICS_TRACKING' ) ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rd...@us...> - 2009-02-04 12:22:17
|
Revision: 1971 http://digir.svn.sourceforge.net/digir/?rev=1971&view=rev Author: rdg Date: 2009-02-04 12:10:35 +0000 (Wed, 04 Feb 2009) Log Message: ----------- Moved streaming control to the main Process function. Modified Paths: -------------- tapirlink/trunk/classes/TpResponse.php tapirlink/trunk/classes/TpSearchResponse.php Modified: tapirlink/trunk/classes/TpResponse.php =================================================================== --- tapirlink/trunk/classes/TpResponse.php 2009-02-02 21:33:34 UTC (rev 1970) +++ tapirlink/trunk/classes/TpResponse.php 2009-02-04 12:10:35 UTC (rev 1971) @@ -67,6 +67,10 @@ function Process() { + // In some cases it is necessary to replace headers (see "header" call + // inside TpXmlGenerator), so avoid echoing content straight away. + ob_start(); + global $g_dlog; $log_data = array(); @@ -179,6 +183,8 @@ $LogStruct->WriteRequestResult( $stats_log ); } + ob_end_flush(); + } // end of member function Process function Header() Modified: tapirlink/trunk/classes/TpSearchResponse.php =================================================================== --- tapirlink/trunk/classes/TpSearchResponse.php 2009-02-02 21:33:34 UTC (rev 1970) +++ tapirlink/trunk/classes/TpSearchResponse.php 2009-02-04 12:10:35 UTC (rev 1971) @@ -65,15 +65,6 @@ } // end of member function Footer - function Process() - { - // This method is redefined here because in some cases it is necessary - // to replace headers (see "header" call inside TpXmlGenerator). - ob_start(); - parent::Process(); - - } // end of member function Footer - function Body() { global $g_dlog; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |