Changeset 241

Timestamp:

20-05-07 15:20:06 (6 years ago)

Author:

thomas

Message:

• moap.doap: Add wiki.
• moap/command/doap.py (Show.do): Add wiki.
• moap/doap/doap.py (Doap.getProject, Project): Fix up query to make more attributes OPTIONAL. Add wiki.
• moap/test/test_doap_doap.py (TestDoap?.testGetProject): Explain assert.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• moap.doap (modified) (1 diff)
• moap/command/doap.py (modified) (1 diff)
• moap/doap/doap.py (modified) (3 diffs)
• moap/test/test_doap_doap.py (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2007-05-20  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+        * moap.doap:
+          Add wiki.
+        * moap/command/doap.py (Show.do):
+          Add wiki.
+        * moap/doap/doap.py (Doap.getProject, Project):
+          Fix up query to make more attributes OPTIONAL.
+          Add wiki.
+        * moap/test/test_doap_doap.py (TestDoap.testGetProject):
+          Explain assert.
+
 2007-05-20  Thomas Vander Stichele  <thomas at apestaart dot org>
 

trunk/moap.doap

@@ -23 +23 @@
  </description>
  <category></category>
+ <wiki rdf:resource="https://thomas.apestaart.org/moap/trac/" />
  <bug-database rdf:resource="https://thomas.apestaart.org/moap/trac/newticket" />
  <screenshots></screenshots>

trunk/moap/command/doap.py

@@ -438 +438 @@
         if project.download_page:
             self.stdout.write("download page:     %s\n" % project.download_page)
+        if project.wiki:
+            self.stdout.write("wiki:              %s\n" % project.wiki)
         if not project.release:
             self.stdout.write("                   No releases made.\n")

trunk/moap/doap/doap.py

@@ -69 +69 @@
         if not self._project:
             self.debug('Querying project')
+            # every argument that can be optional separately
+            # has to be inside its own OPTIONAL block
             querystring = """
 PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
 PREFIX doap: <http://usefulinc.com/ns/doap#>
 PREFIX foaf: <http://xmlns.com/foaf/0.1/>
-SELECT ?name, ?shortname, ?description, ?shortdesc,
-       ?homepage, ?bug, ?download, ?created
+SELECT ?name, ?shortname, $description, ?shortdesc,
+       ?homepage, ?bug, ?download, ?wiki, ?created
 WHERE {
-          ?project rdf:type doap:Project .
-          ?project doap:name ?name .
-          ?project doap:shortname ?shortname .
-          ?project doap:created ?created .
-          ?project doap:description ?description .
-          ?project doap:homepage ?homepage .
-          ?project doap:bug-database ?bug .
-          ?project doap:download-page ?download .
-          ?project doap:shortdesc ?shortdesc
+    ?project rdf:type doap:Project .
+    ?project doap:homepage ?homepage .
+    ?project doap:name ?name .
+    ?project doap:shortname ?shortname
+    OPTIONAL { ?project doap:description $description }
+    OPTIONAL { ?project doap:shortdesc ?shortdesc }
+    OPTIONAL { ?project doap:created ?created }
+    OPTIONAL { ?project doap:bug-database ?bug }
+    OPTIONAL { ?project doap:download-page ?download }
+    OPTIONAL { ?project doap:wiki ?wiki }
 }
 """
@@ -92 +95 @@
             # because r[0] won't work
             for r in result: pass
+            self.log('Query result: %r' % r)
             
             p = Project()
+            
+            # homepage is required
+            p.homepage = stringifyNode(r['homepage'])
+
             p.name = str(r['name'])
             self.debug('Found Project named %s' % p.name)
-            self.log('Query result: %r' % r)
+
             p.shortname = str(r['shortname'])
-            if r.has_key('created'):
+
+            # optional nodes
+            if r['description']:
+                p.description = r['description'].literal_value['string']
+            if r['shortdesc']:
+                p.shortdesc = r['shortdesc'].literal_value['string'].strip()
+            if r['created']:
                 p.created = str(r['created'])
-            p.description = r['description'].literal_value['string']
-            if r.has_key('shortdesc'):
-                p.shortdesc = r['shortdesc'].literal_value['string'].strip()
-            if r.has_key('homepage'):
-                p.homepage = stringifyNode(r['homepage'])
-            if r.has_key('bug'):
+            if r['bug']:
                 p.bug_database = stringifyNode(r['bug'])
-            if r.has_key('download'):
+            if r['download']:
                 p.download_page = stringifyNode(r['download'])
+            if r['wiki']:
+                p.wiki = stringifyNode(r['wiki'])
+
             self._project = p
 
@@ -192 +204 @@
     bug_database = None
     download_page = None
+    wiki = None
 
     def __init__(self):

trunk/moap/test/test_doap_doap.py

@@ -19 +19 @@
         self.assertEquals(p.name, 'Mach')
         self.assertEquals(p.shortname, 'mach')
-        self.failUnless(p.description)
+        self.failUnless(p.description, "No description")
 
         self.assertEquals(len(p.release), 11)