cleanup, add info, remove item ordering in the model (was breaking the geo-navigator...

diff --git a/AUTHORS b/AUTHORS
index 4ece85048ab8c61a6d5b136ef6cc058d0941d981..c284da206b419d631f3f610bc1c6fce32411cb59 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,2 +1,3 @@
 Guillaume Pellerin <yomguy@altern.org>
 Olivier Guilyardi <olivier@samalyse.com>
+Riccardo Zaccarelli <riccardo.zaccarelli@gmail.com>

diff --git a/README.rst b/README.rst
index 508ef94a396bec934261c05ad2ebdcbafdaebe0b..7a96389799dcd6c604fc5a0c49dbe372ccda2d2d 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -52,7 +52,7 @@ To get the lastest development version, you need subversion and run::
 
 Licence
 =======
-CeCILL v2 (see COPYING)
+CeCILL v2 (see LICENSE)
 
 
 Bugs and feedback
@@ -86,7 +86,7 @@ Contact
 Sponsors
 ========
 
-The Telemeta project is developed by Parisson and Samalyse. It is sponsored by :
+The Telemeta project is developed by Parisson. It is sponsored by :
 
   * CNRS : Centre National de la Recherche Scientifique (the french Natianal Research and Scientific Center)
     http://cnrs.fr
@@ -99,4 +99,3 @@ The Telemeta project is developed by Parisson and Samalyse. It is sponsored by :
     http://www.musee-europemediterranee.org
   * MMSH : Maison Méditerranéenne des Sciences de l'Homme
     http://www.mmsh.univ-aix.fr/
-  *  The Antropponet Project (ended)

diff --git a/make_doc.py b/make_doc.py
deleted file mode 100644 (file)
index 1fbd24e..0000000
--- a/make_doc.py
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-# needs epydoc
-
-epydoc -n telemeta -u http://telemeta.org -o doc/html/ telemeta/
-

diff --git a/telemeta/models/media.py b/telemeta/models/media.py
index eb37a53bff05651066ed134ad9bc1cf541e8570f..97d03d29772da257423ab87dbf3089513c627d14 100644 (file)
--- a/telemeta/models/media.py
+++ b/telemeta/models/media.py
@@ -284,7 +284,7 @@ class MediaItem(MediaResource):
 
     class Meta(MetaCore):
         db_table = 'media_items'
-        ordering = ['code', 'old_code']
+#        ordering = ['code', 'old_code']
 
     def is_valid_code(self, code):
         "Check if the item code is well formed"

diff --git a/telemeta/urls.py b/telemeta/urls.py
index fd29301a7494286483fd28194c4a487734c023f4..fa537954e511a0539f7e16ac52bb5f0a3dac4e0d 100644 (file)
--- a/telemeta/urls.py
+++ b/telemeta/urls.py
@@ -47,7 +47,7 @@ telemeta.config.check()
 web_view = WebView()
 
 # query sets for Django generic views
-all_items = { 'queryset': MediaItem.objects.enriched(), }
+all_items = { 'queryset': MediaItem.objects.enriched().order_by('code', 'old_code') }
 all_collections = { 'queryset': MediaCollection.objects.enriched(), }
 
 # CREM collections

diff --git a/telemeta/web/base.py b/telemeta/web/base.py
index 0584ff3f9bcf764b7b1676e44fca7cf7320d4056..81aef0fa534e36787db6a0122355653191bc974a 100644 (file)
--- a/telemeta/web/base.py
+++ b/telemeta/web/base.py
@@ -89,9 +89,9 @@ def stream_from_processor(__decoder, __processor, __flag):
             break
         yield __processor.chunk
 
-def stream_from_file(file):
+def stream_from_file(__file):
     chunk_size = 0x10000
-    f = open(file, 'r')
+    f = open(__file, 'r')
     while True:
         __chunk = f.read(chunk_size)
         if not len(__chunk):