Deal better with missing overrides.

josephw · Sep 25, 2010 · f4e4809 · f4e4809
1 parent 6b4b90c
commit f4e4809
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/perl/Mivvi/Overrides.pm b/perl/Mivvi/Overrides.pm
@@ -192,7 +192,7 @@ sub bestUriFor($$$$;$)
  # Is there a temporary URI for this episode that specifies a better alternative?
  my $tempUri = $self->tempUriFor($series, $season, $episode);
  $sa = $model->target(RDF::Redland::Node->new(RDF::Redland::URI->new($tempUri)), $predOwlSameAs);
- if($sa) {
+ if($sa && $sa->uri) {
   my $u = $sa->uri->as_string;
   if ($origUri && $self->{PUBLISHED}->{$origUri}) {
    $self->{PUBLISHED_OVERRIDES}->{$origUri} = $u;
@@ -207,7 +207,7 @@ sub getOverriddenPublishedUris($)
 {
  my $self = shift;
 
- return $self->{PUBLISHED_OVERRIDES};
+ return $self->{PUBLISHED_OVERRIDES} || {};
 }
 
 1;
diff --git a/perl/test_MivviOverrides.t b/perl/test_MivviOverrides.t
@@ -2,7 +2,7 @@
 
 use strict;
 
-use Test::More(tests => 33);
+use Test::More(tests => 34);
 use Mivvi::Overrides;
 
 my ($o, @l);
@@ -85,6 +85,7 @@ is($o->getDate('http://www.example.com/1/1#'), '', 'Blank dates should be passed
 
 # Store overrides of published URIs
 $o = Mivvi::Overrides->new();
+ok($o->getOverriddenPublishedUris(), 'getOverriddenPublishedUris is never undef');
 $o->loadRdfXml('test_MivviOverrides_overriddenPublishedUris.rdf');
 $o->loadPublishedUris('test_MivviOverrides_publishedOriginalUris.txt');
 

diff --git a/python/show-local-identifiers.py b/python/show-local-identifiers.py
@@ -47,20 +47,24 @@ def mtmp(series,part=''):
 
 idxPrefix = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#_'
 
+def appendUnlessBlank(model, subj, pred, obj):
+  if not(obj.is_blank()):
+    model.append(RDF.Statement(subj, pred, obj))
+
 def produceSeasonStatements(model, name, season, target):
   snum = model.get_target(season, RDF.Node(Mivvi.MVI('seasonNumber')))
   if snum == None:
     return
   snum = str(snum.literal_value['string'])
-  target.append(RDF.Statement(mtmp(name, snum), Mivvi.OWL('sameAs'), season))
+  appendUnlessBlank(target, mtmp(name, snum), Mivvi.OWL('sameAs'), season)
 
   eps = model.get_target(season, Mivvi.MVI('episodes'))
   for s in model.find_statements(RDF.Statement(eps, None, None)):
     ps = str(s.predicate.uri)
     if ps.startswith(idxPrefix):
       pnum = int(ps[len(idxPrefix):])
       if model.contains_statement(RDF.Statement(s.object, predType, typeEpisode)):
-        target.append(RDF.Statement(mtmp(name, snum + 'x' + str(pnum)), Mivvi.OWL('sameAs'), s.object))
+        appendUnlessBlank(target, mtmp(name, snum + 'x' + str(pnum)), Mivvi.OWL('sameAs'), s.object)
 
 def produceStatements(model, name, series, target):
   target.append(RDF.Statement(mtmp(name), Mivvi.OWL('sameAs'), series))