Changeset 195

Timestamp:

08/22/08 18:12:15 (11 months ago)

Author:

rgrp

Message:

[shakespeare/misc][s]: remove concordance.py and all references and tidy up guide WUI page.

Location:

trunk

Files:

• shakespeare/concordance.py (deleted)
• shakespeare/concordance_test.py (deleted)
• shakespeare/controllers/site.py (modified) (2 diffs)
• shakespeare/controllers/text.py (modified) (1 diff)
• shakespeare/templates/guide.html (modified) (4 diffs)
• shakespeare/tests/functional/test_site.py (modified) (1 diff)
• test.ini (modified) (1 diff)

trunk/shakespeare/controllers/site.py

@@ -8 +8 @@
 import shakespeare.index
 import shakespeare.format
-import shakespeare.concordance
 import shakespeare.model as model
 
@@ -26 +25 @@
     def guide(self):
         return render('guide')
-
-    def concordance(self, word=None):
-        # TODO: support concordance/word
-        return self.concordance_index()
-
-    def concordance_index(self):
-        stats = shakespeare.concordance.Statistics()
-        c.words = stats.keys()
-        return render('concordance')
-
-    def concordance_word(self, word=None):
-        # TODO: sort by work etc
-        import shakespeare.textutils
-        refs = []
-        cc = shakespeare.concordance.Concordance()
-        if word is not None:
-            refs = list(cc.get(word))
-        newrefs = []
-        for ref in refs:
-            # we use the 'plain' format when building the concordance
-            ff = ref.text.get_text()
-            snippet = shakespeare.textutils.get_snippet(ff, ref.char_index)
-            ref.snippet = snippet
-        c.word = word
-        c.refs = refs
-        return render('concordance_by_word')
 
     # 2008-04-26 (rgrp): none of these annotater related items

trunk/shakespeare/controllers/text.py

@@ -8 +8 @@
 import shakespeare.index
 import shakespeare.format
-import shakespeare.concordance
 import shakespeare.model as model
 

trunk/shakespeare/templates/guide.html

@@ -13 +13 @@
     </h2>
     <p>
-      The <a href="/index/">index page</a> contains a list of all of the
-      material on the system.
+      The <a href="${h.url_for(controller='text', action='index')}">text index
+        page</a> contains a list of all of the material on the system.
     </p>
     <h2>
@@ -22 +22 @@
       You can view works by clicking on the link available from the index page.
       If you know the 'id' of a text you can view it directly by visiting the
-                        url: /view?name={id} (you can work out id names by looking at the link
-                        urls on the index page).
+      url: ${h.url_for(controller='text', action='view', name='id')} (you can work
+      out id names by looking at the link urls on the index page).
     </p>
     
@@ -30 +30 @@
       You can view a given text in a different format by setting the format
       argument in the url query string like so:
-      /view?name={id}&amp;format={format_name} So to view hamlet with line
-      numbers visit: <a
-        href="/view?name=hamlet_gut&amp;format=lineno">/view?name=hamlet_gut&amp;format=lineno</a> Available formats are:
+    </p>
+    <pre>
+      ${h.url_for(controller='text', action='view', name='id', format='format_name')}
+    </pre>
+    <p>
+      So to view Hamlet with line numbers shown you would visit:
+    </p>
+    <blockquote><p>
+      <a href="${h.url_for(controller='text', action='view', name='hamlet_gut', format='lineno')}">
+        ${h.url_for(controller='text', action='view', name='hamlet_gut', format='lineno')}</a>
+    </p></blockquote>
+    <p>
+      Available formats are:
     </p>
     <ul>
@@ -45 +55 @@
       separated by '+'. For example to see the Gutenberg folio and non-folio
       Othello side-by-side you would visit: <a
-        href="/view?name=othello_gut_f+othello_gut">/view?name=othello_gut_f+othello_gut</a>
+        href="${h.url_for(controller='text', action='view', name='othello_gut_f othello_gut')}">
+        ${h.url_for(controller='text', action='view', name='othello_gut_f othello_gut')}
+      </a>
     </p>
 
     <h2>
-      Concordance
+      Search
     </h2>
     <p>
-      The <a href="/concordance/">concordance page</a> provides a concordance of
-      Shakespeare's work along with some associated statistics on word
-      occurences.
+      See the <a href="${h.url_for(controller='search', action='index')}">search section</a>.
     </p>
+
+    <h2>
+      Search
+    </h2>
+    <p>
+      See the <a href="${h.url_for(controller='stats', action='index')}">stats section</a>.
+    </p>
+
 
     <h2>Comments</h2>
     <p>
-      If you wish to comment on this guide (or help improve it!) please visit
-      <a href="http://www.openshakespeare.org/">http://www.openshakespeare.org</a>
+      If you wish to comment on this guide (or help improve it!) please drop a
+      line to the Open Shakespeare team via at info [at] okfn [dot] org.
     </p>
   </div>

trunk/shakespeare/tests/functional/test_site.py

@@ -16 +16 @@
         res = self.app.get(url)
         assert 'guide to the features of the Open Shakespeare web' in res
-
-    def _test_concordance(self):
-        url = url_for(controller='site', action='concordance')
-        res = self.app.get(url)
 
     # 2008-04-26 rgrp: not working

trunk/test.ini

@@ -20 +20 @@
 
 # Add additional test specific configuration options as necessary.
+sqlalchemy.url = sqlite:///%(here)s/testshkspr.db