Permalink
Browse files

Merge branch 'master' of git://github.com/tomkralidis/pycsw into wsgi

  • Loading branch information...
ahinz committed Apr 22, 2012
2 parents 331a6fd + 461b6b2 commit 262e1ea0d3d9a6b56ae969db190b68ccd48a658c
View
@@ -39,7 +39,7 @@ maxrecords=10
#loglevel=DEBUG
#logfile=/tmp/pycsw.log
#ogc_schemas_base=http://foo
-#federatedcatalogues=http://geodiscover.cgdi.ca/wes/serviceManagerCSW/csw
+#federatedcatalogues=http://geo.data.gov/geoportal/csw/discovery
#pretty_print=true
#gzip_compresslevel=8
#domainquerytype=range
View
@@ -1152,16 +1152,20 @@ def getrecords(self):
'Distributed search results from catalogue \
%s: %s.' % (fedcat, remotecsw.results))
- if int(remotecsw.results['matches']) > 0:
- matched = str(int(matched) + \
- int(remotecsw.results['matches']))
+ remotecsw_matches = int(remotecsw.results['matches'])
+ plural = 's' if remotecsw_matches != 1 else ''
+ if remotecsw_matches > 0:
+ matched = str(int(matched) + remotecsw_matches)
dsresults.append(etree.Comment(
- '%s results from %s' %
- (remotecsw.results['matches'], fedcat)))
+ ' %d result%s from %s ' %
+ (remotecsw_matches, plural, fedcat)))
dsresults.append(remotecsw.records)
except Exception, err:
+ error_string = 'remote CSW %s returned error: ' % fedcat
+ dsresults.append(etree.Comment(
+ ' %s\n\n%s ' % (error_string, remotecsw.response)))
self.log.debug(str(err))
if int(matched) == 0:
@@ -245,7 +245,7 @@
<ows:Value>SOAP</ows:Value>
</ows:Constraint>
<ows:Constraint name="FederatedCatalogues">
- <ows:Value>http://geodiscover.cgdi.ca/wes/serviceManagerCSW/csw</ows:Value>
+ <ows:Value>http://geo.data.gov/geoportal/csw/discovery</ows:Value>
</ows:Constraint>
<inspire_ds:ExtendedCapabilities xsi:schemaLocation="http://inspire.ec.europa.eu/schemas/inspire_ds/1.0 http://inspire.ec.europa.eu/schemas/inspire_ds/1.0/inspire_ds.xsd">
<inspire_common:ResourceLocator>
@@ -245,7 +245,7 @@
<ows:Value>SOAP</ows:Value>
</ows:Constraint>
<ows:Constraint name="FederatedCatalogues">
- <ows:Value>http://geodiscover.cgdi.ca/wes/serviceManagerCSW/csw</ows:Value>
+ <ows:Value>http://geo.data.gov/geoportal/csw/discovery</ows:Value>
</ows:Constraint>
<inspire_ds:ExtendedCapabilities xsi:schemaLocation="http://inspire.ec.europa.eu/schemas/inspire_ds/1.0 http://inspire.ec.europa.eu/schemas/inspire_ds/1.0/inspire_ds.xsd">
<inspire_common:ResourceLocator>
@@ -245,7 +245,7 @@
<ows:Value>SOAP</ows:Value>
</ows:Constraint>
<ows:Constraint name="FederatedCatalogues">
- <ows:Value>http://geodiscover.cgdi.ca/wes/serviceManagerCSW/csw</ows:Value>
+ <ows:Value>http://geo.data.gov/geoportal/csw/discovery</ows:Value>
</ows:Constraint>
</ows:OperationsMetadata>
<ogc:Filter_Capabilities>
@@ -207,7 +207,7 @@
<ows:Value>SOAP</ows:Value>
</ows:Constraint>
<ows:Constraint name="FederatedCatalogues">
- <ows:Value>http://geodiscover.cgdi.ca/wes/serviceManagerCSW/csw</ows:Value>
+ <ows:Value>http://geo.data.gov/geoportal/csw/discovery</ows:Value>
</ows:Constraint>
</ows:OperationsMetadata>
<ogc:Filter_Capabilities>
@@ -189,7 +189,7 @@
<ows:Value>SOAP</ows:Value>
</ows:Constraint>
<ows:Constraint name="FederatedCatalogues">
- <ows:Value>http://geodiscover.cgdi.ca/wes/serviceManagerCSW/csw</ows:Value>
+ <ows:Value>http://geo.data.gov/geoportal/csw/discovery</ows:Value>
</ows:Constraint>
</ows:OperationsMetadata>
<ogc:Filter_Capabilities>
@@ -191,7 +191,7 @@
<ows:Value>SOAP</ows:Value>
</ows:Constraint>
<ows:Constraint name="FederatedCatalogues">
- <ows:Value>http://geodiscover.cgdi.ca/wes/serviceManagerCSW/csw</ows:Value>
+ <ows:Value>http://geo.data.gov/geoportal/csw/discovery</ows:Value>
</ows:Constraint>
</ows:OperationsMetadata>
<ogc:Filter_Capabilities>
@@ -189,7 +189,7 @@
<ows:Value>SOAP</ows:Value>
</ows:Constraint>
<ows:Constraint name="FederatedCatalogues">
- <ows:Value>http://geodiscover.cgdi.ca/wes/serviceManagerCSW/csw</ows:Value>
+ <ows:Value>http://geo.data.gov/geoportal/csw/discovery</ows:Value>
</ows:Constraint>
</ows:OperationsMetadata>
<ogc:Filter_Capabilities>
@@ -189,7 +189,7 @@
<ows:Value>SOAP</ows:Value>
</ows:Constraint>
<ows:Constraint name="FederatedCatalogues">
- <ows:Value>http://geodiscover.cgdi.ca/wes/serviceManagerCSW/csw</ows:Value>
+ <ows:Value>http://geo.data.gov/geoportal/csw/discovery</ows:Value>
</ows:Constraint>
</ows:OperationsMetadata>
<ogc:Filter_Capabilities>
Oops, something went wrong.

0 comments on commit 262e1ea

Please sign in to comment.