* src/ArgHandler.py (parse_args): Use mime type to identify gramps

XML data.
* doc/gramps.1.in: Update man page.
* doc/gramps-manual/C/cmdline.xml: Update manual.

* src/PeopleModel.py: provide a work around for the python 2.3 bug
unicode sorting problem with locale.strcoll. For a nul termination
during sorting, strip it off after sorting. Only used for
python2.3, since this bug was fixed in python 2.4.


svn: r5019

gramps2/doc/gramps-manual/C/cmdline.xml

@@ -70,7 +70,7 @@
           	<varlistentry><term>gramps-xml</term>
           	<listitem><para> &app; XML database. This format is available 
                 for opening, import, and export. When not specified, it can be 
-                guessed if the filename represents a directory.
+                guessed if the filename ends with .gramps
                 </para></listitem></varlistentry>
 
           	<varlistentry><term>gedcom</term>
@@ -82,13 +82,13 @@
           	<varlistentry><term>gramps-pkg</term>
           	<listitem><para> &app; package. This format is available 
                 for import and export. When not specified, it can be 
-                guessed if the filename ends with .tgz
+                guessed if the filename ends with .gpkg
                 </para></listitem></varlistentry>
 
           	<varlistentry><term>geneweb</term>
           	<listitem><para> GeneWen file This format is available 
                 for import and export. When not specified, it can be 
-                guessed if the filename ends with gw
+                guessed if the filename ends with .gw
                 </para></listitem></varlistentry>
 
           	<varlistentry><term>wft</term>
@@ -134,12 +134,7 @@
           <command>--format=<replaceable>format</replaceable></command>
           option, immediately following the <filename>filename</filename>. 
           If not specified, the guess will be attempted based on 
-          the <filename>filename</filename>. For gramps-xml 
-          format, the <filename>filename</filename> is actually the 
-          name of directory under which the gramps database resides. For 
-          grdb and gedcom, 
-          the <filename>filename</filename> is the name of the 
-          corresponding file.
+          the <filename>filename</filename>.
           </para>
 
           <tip><para>Only grdb, gramps-xml,
@@ -163,12 +158,7 @@
           <command>--format=<replaceable>format</replaceable></command>
           option, immediately following the <filename>filename</filename>. 
           If not specified, the guess will be attempted based on 
-          the <filename>filename</filename>. For gramps-xml 
-          format, the <filename>filename</filename> is actually the 
-          name of directory under which the gramps database resides. For 
-          grdb, gedcom, gramps-pkg, and geneweb,
-          the <filename>filename</filename> is the name of the 
-          corresponding file.
+          the <filename>filename</filename>.
           </para>
 
           <tip><para>More than one file can be imported in one command.
@@ -195,10 +185,10 @@
           option. The format can be specified with the <command>-f</command> 
           option immediately following the <filename>filename</filename>. 
           If not specified, the guess will be attempted based on 
-          the <filename>filename</filename>. For gramps-xml 
-          and iso formats, the <filename>filename</filename> 
+          the <filename>filename</filename>. For iso format, 
+          the <filename>filename</filename> 
           is actually the name of directory the gramps database will be written 
-          into. For grdb, gedcom, wft, geneweb,
+          into. For grdb, gramps-xml, gedcom, wft, geneweb,
           and gramps-pkg, the <filename>filename</filename> 
           is the name of the resulting file.
           </para>
@@ -411,8 +401,8 @@
         <listitem>
         <para><command>gramps 
             -i<filename>file1.ged</filename>
-            -i <filename>file2.tgz</filename>
-            -i <filename>~/db3</filename>
+            -i <filename>file2.gpkg</filename>
+            -i <filename>~/db3.gramps</filename>
             -i <filename>file4.wft</filename>
             -a <filename>check</filename></command>
         </para> </listitem></varlistentry>
@@ -424,10 +414,10 @@
         <para><command>gramps 
             -i <filename>file1.ged</filename> 
             -f <replaceable>gedcom</replaceable> 
-            -i <filename>file2.tgz</filename> 
+            -i <filename>file2.gpkg</filename> 
             -f <replaceable>gramps-pkg</replaceable> 
-            -i <filename>~/db3</filename> 
-            -f <replaceable>gramps</replaceable> 
+            -i <filename>~/db3.gramps</filename> 
+            -f <replaceable>gramps-xml</replaceable> 
             -i <filename>file4.wft</filename> 
             -f <replaceable>wft</replaceable> 
             -a <replaceable>check</replaceable></command>
@@ -441,7 +431,7 @@
        <listitem>
         <para><command>gramps 
             -i <filename>file1.ged</filename> 
-            -i <filename>file2.tgz</filename> 
+            -i <filename>file2.gpkg</filename> 
             -o <filename>~/new-package</filename> 
             -f <replaceable>gramps-pkg</replaceable></command> 
         </para></listitem>
@@ -454,7 +444,7 @@
         <listitem>
         <para><command>gramps 
             -i <filename>file1.ged</filename> 
-            -i <filename>file2.tgz</filename> 
+            -i <filename>file2.dpkg</filename> 
             -o <filename>~/new-package</filename> 
             -f <replaceable>gramps-pkg</replaceable> 
         &gt;<filename>outfile</filename> 
@@ -468,8 +458,8 @@
        <listitem>
         <para><command>gramps 
             -i <filename>file1.ged</filename> 
-            -i <filename>file2.tgz</filename> 
-            -i <filename>~/db3</filename>
+            -i <filename>file2.gpkg</filename> 
+            -i <filename>~/db3.gramps</filename>
         </command>
         </para> </listitem>
        </varlistentry>