* Clear some install features

diff --git a/INSTALL b/INSTALL
index 1666d37d66eb5c75d822ccfdd9afdd3726f7faef..86958572298b95d34302f040ebd2fa39d95c3f38 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -7,11 +7,11 @@
 
 python (>= 2.3.5-7), python-xml, python-central (>= 0.5),
 python-mutagen, python-django (>= 0.96.1), sox, vorbis-tools, flac, normalize-audio,
-ecasound, festival, par2, python-mysqldb, sqlite3 | mysql-server, octave2.9,
+python-mysqldb, sqlite3 | mysql-server, octave2.9,
 octave2.9-forge, python-tk, libgd2-xpm, libsndfile1
 
 optional:
-lame
+lame, ecasound, par2
 
 # 2. Install
 # ==========
@@ -42,7 +42,7 @@ lame
   Uncompress the archive, go to the main folder of telemeta and run this command
   in a shell as root:
 
-    $ python setup.py install
+    $ sudo python setup.py install
 
 * Compile wav2png in telemeta/telemeta/visualization/wav2png
 
@@ -51,54 +51,52 @@ lame
     $ cd ~/my_projects
     $ django-admin startproject mysite
 
-2.3. Put a link to telemeta into your Django project:
-
-    $ ln -s ~/my_apps/telemeta/telemeta ~/my_projects/mysite/telemeta
-
-    OR: add the telemeta path to PYTHONPATH
-
-2.4. Create the media and cache directories:
+2.3. Create the media and cache directories:
 
     $ cd mysite
     $ mkdir media cache
 
     You might want to place these somewhere else...
 
-2.5. Configure Django (settings.py):
+2.4. Configure Django (settings.py):
 
     Modifiy the following variables:
 
     DATABASE_*: your database settings (don't forget to create the database if needed)
     MEDIA_ROOT: absolute path to the media directory you just created
-    INSTALLED_APPS: add 'mysite.telemeta'
+    INSTALLED_APPS: add 'telemeta'
 
     Add the following variables:
 
-    TELEMETA_CACHE_DIR: absolute path to the cache directory you just created
+    TELEMETA_CACHE_DIR = absolute path to the cache directory you just created
 
     Just paste the two lines below:
     TELEMETA_EXPORT_CACHE_DIR = TELEMETA_CACHE_DIR + "/export"
     CACHE_BACKEND = "file://" + TELEMETA_CACHE_DIR + "/data"
 
-2.6. Initialize the database:
+2.5. Initialize the database:
 
     $ python manage.py syncdb
 
-2.7. Configure your urls:
+2.6. Configure your urls:
 
     The simplest case is to have telemeta running at public root. To do so, add
     this url in urls.py :
 
     (r'^', include('telemeta.urls')),
 
-2.8. Start the project:
+2.7. Start the project:
 
     $ python manage.py runserver
 
-2.9. Go the web page:
+    By default, the server starts on the port 8000.
+    You can override this with, for example:
 
-    http://localhost:8000
+    $ python manage.py runserver 9000
+    
+2.8. Go the web page:
 
+    http://localhost:8000
 
 
 See README and http://svn.parisson.org/telemeta/ for more informations.

diff --git a/telemeta/export/core.py b/telemeta/export/core.py
index 063a5bfa52444390aee7ccb7472f48f3c6d576f4..1649c07db061493eccd35a78e832e2676a86f184 100644 (file)
--- a/telemeta/export/core.py
+++ b/telemeta/export/core.py
@@ -272,8 +272,4 @@ def verify_par_key(path):
     """ Verify a par2 key """
     os.system('par2 v "'+path+'.par2"')
 
-def get_consts_value(self, data):
-    value = self.collection.__dict__[data]
-    value_type = getType(value)
-    return value, value_type