Updates

svn: r1568

gramps2/NEWS

@@ -15,10 +15,12 @@ Version 0.9.2
 * Long-awaited Export to CD.
 * Added support for AbiWord 1.9 or greater, AbiWord 1.9+ supports tables,
   allowing a greater range of reports to be supported.
-* Save confirmation on Help->Open Example and File->New.
+* Added Save confirmation on Help->Open Example and File->New.
 * Command-line options (-i -o -f -a) support is added in its experimental stage.
   Please try hard to break it and report to gramps-devel.
 * Man page is updated.
+* Huge speed-up in Select Child (~25x) and Choose Parents (75x-150x) dialogs.
+* Dozens of bug fixes.
 
 Version 0.9.1
 * Custom paper sizes may be set for reports

gramps2/TODO

@@ -1,9 +1,6 @@
 * Allow for multiple notes. A tabbed interface would be really useful,
   since there are no titles for notes. Not all objects would necessarily
   need multiple notes. Determine which ones should and shouldn't.
-* Drag and drop should display the icon we are dragging instead of just
-  the default icon.  Nautilus does this very effectively, and GTK has
-  support for this.
 * Speed up the reading of the database. The python XML routines are not
   as fast as I would like, and it can take a minute or so to read a
   large database. This is way too slow.

gramps2/doc/gramps.1.in

@@ -33,12 +33,19 @@ wide by almost all other geneology software.
 .SH OPTIONS
 .TP 
 .BI \-f " FORMAT"
-Explicitly specify format of the filename given by preceding \fB\-i\fR or 
+Explicitly specify format of \fIFILENAME\fR given by preceding \fB\-i\fR or 
-\fB\-o\fR options. If the \fB\-f\fR option is not given, the format of each 
+\fB\-o\fR option. If the \fB\-f\fR option is not given for any \fIFILENAME\fR, 
-file is guessed according to its extension. Formats available 
+the format of that file is guessed according to its extension. 
-for import are \fBgramps\fR, \fBgedcom\fR, and \fBgramps\-pkg\fR. Formats 
+.br
-available for export are \fBgramps\fR, \fBgedcom\fR, \fBgramps\-pkg\fR, 
+
-and \fBiso\fR.
+Formats 
+available for import are \fBgramps\fR (guessed if \fIFILENAME\fR is a 
+directory), \fBgedcom\fR (guessed if \fIFILENAME\fR ends with \fB.ged\fR), and 
+\fBgramps\-pkg\fR (guessed if \fIFILENAME\fR ends with \fB.tgz\fR). 
+.br
+
+Formats available for export are \fBgramps\fR, \fBgedcom\fR, \fBgramps\-pkg\fR, 
+and \fBiso\fR (never guessed, always specify with \fB\-f\fR option).
 
 .TP 
 .BI \-i " FILENAME"
@@ -47,8 +54,9 @@ is actually the name of directory under which the gramps database resides.
 For \fBgedcom\fR and \fBgramps\-pkg\fR, the \fIFILENAME\fR is the name of 
 the corresponding file. 
 .br
-When more than one file is given, each has to be preceded by \fB\-i\fR flag. 
+
-The files are imported in the specified order, 
+When more than one input file is given, each has to be preceded by \fB\-i\fR 
+flag. The files are imported in the specified order, 
 i.e. \fB\-i\fR \fIFILE1\fR \fB\-i\fR \fIFILE2\fR  
 and \fB\-i\fR \fIFILE2\fR \fB\-i\fR \fIFILE1\fR might produce different 
 gramps IDs in the resulting database. 
@@ -59,13 +67,31 @@ Export data into \fIFILENAME\fR. For \fBgramps\fR and \fBiso\fR formats, the
 \fIFILENAME\fR is actually the name of directory the gramps database will be 
 written into. For \fBgedcom\fR and \fBgramps\-pkg\fR, the \fIFILENAME\fR 
 is the name of the resulting file. 
+.br
+
+When more than one output file is given, each has to be preceded 
+by \fB\-o\fR flag. The files are written one by one, in the specified order.
 
 .TP 
 .BI \-a " ACTION"
 Perform \fIACTION\fR on the imported data. This is done after all imports
-are succesfully completed. Available actions are \fBsummary\fR (same as 
+are succesfully completed. Currently available actions are \fBsummary\fR 
-Reports->View->Summary menu item) and \fBcheck\fR (same 
+(same as Reports->View->Summary) and \fBcheck\fR (same as Tools->Database 
-as Tools->Database Processing->Check and repair).
+Processing->Check and Repair).
+.br
+
+When more than one output action is given, each has to be preceded 
+by \fB\-a\fR flag. The actions are performed one by one, in the specified order.
+
+.LP
+The order of \fB\-i\fR, \fB\-o\fR, or \fB\-a\fR options does not matter. The
+actual order always is: all imports (if any) -> all exports (if any) -> 
+all actions (if any). 
+
+.LP
+If no \fB\-i\fR option is given, gramps will launch its main 
+window and start the usual interactive session with the empty database
+(since there is no data to process, anyway).
 
 .LP
 If no \fB\-o\fR or \fB\-a\fR options are given, gramps will launch its main 

gramps2/src/gramps_main.py

@@ -207,9 +207,8 @@ class Gramps:
                         os._exit(1)
                     actions.append(action)
             
-            self.cl = bool(exports or actions)
-
             if imports:
+                self.cl = bool(exports or actions)
                 # Create dir for imported database(s)
                 self.impdir_path = os.path.expanduser("~/.gramps/import" )
                 if not os.path.isdir(self.impdir_path):
@@ -234,7 +233,12 @@ class Gramps:
                 for imp in imports:
                     print "Importing: file %s, format %s." % (imp[0],imp[1])
                     self.cl_import(imp[0],imp[1])
+            else:
+                print "No data was given. Launching interactive session."
+                print "To use in the command-line mode,", \
+                    "supply at least one input file to process."
 
+            if self.cl:
                 for expt in exports:
                     print "Exporting: file %s, format %s." % (expt[0],expt[1])
                     self.cl_export(expt[0],expt[1])
@@ -243,7 +247,6 @@ class Gramps:
                     print "Performing action: %s." % action
                     self.cl_action(action)
             
-            if self.cl:
                 print "Cleaning up."
                 # clean import dir up after use
                 files = os.listdir(self.impdir_path) ;