Postgres 8.3 represents money with 64 bits. Compensate accordingly.

diff --git a/po/de.po b/po/de.po
index 74efeea810a29aa74c8022716a6ffa0c3902d3c7..b1bcc09f171deb64abaa462447e8abfadfe1c739 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PSPP 0.4.3\n"
 "Report-Msgid-Bugs-To: pspp-dev@gnu.org\n"
-"POT-Creation-Date: 2008-02-04 18:26+0900\n"
+"POT-Creation-Date: 2008-02-05 07:19+0900\n"
 "PO-Revision-Date: 2006-07-28 19:32+0800\n"
 "Last-Translator: John Darrington <john@darrington.wattle.id.au>\n"
 "Language-Team: German <pspp-dev@gnu.org>\n"
@@ -47,6 +47,12 @@ msgstr "Tag %d muß zwischen 0 bit 31 sein."
 msgid "Date %04d-%d-%d is before the earliest acceptable date of 1582-10-15."
 msgstr ""
 
+#: src/data/casereader-filter.c:221
+msgid ""
+"At least one case in the data read had a weight value that was user-missing, "
+"system-missing, zero, or negative.  These case(s) were ignored."
+msgstr ""
+
 #: src/data/case-tmpfile.c:57
 msgid "failed to create temporary file"
 msgstr ""
@@ -67,12 +73,6 @@ msgstr "plotzlich ist der Datei beendet"
 msgid "writing to temporary file"
 msgstr ""
 
-#: src/data/casereader-filter.c:221
-msgid ""
-"At least one case in the data read had a weight value that was user-missing, "
-"system-missing, zero, or negative.  These case(s) were ignored."
-msgstr ""
-
 #: src/data/data-in.c:254 src/data/data-in.c:444
 msgid "Field contents are not numeric."
 msgstr ""
@@ -320,14 +320,14 @@ msgid "%s variables are not compatible with %s format %s."
 msgstr ""
 
 #: src/data/format.c:330 src/data/sys-file-reader.c:639
-#: src/ui/gui/data-editor.glade:1304 src/ui/gui/psppire-var-store.c:493
-#: src/ui/gui/psppire.glade:2176
+#: src/ui/gui/data-editor.glade:1304 src/ui/gui/psppire.glade:2176
+#: src/ui/gui/psppire-var-store.c:493
 msgid "String"
 msgstr "Zeichenkette"
 
 #: src/data/format.c:330 src/data/sys-file-reader.c:639
-#: src/ui/gui/data-editor.glade:1193 src/ui/gui/psppire-var-store.c:486
-#: src/ui/gui/psppire.glade:2131
+#: src/ui/gui/data-editor.glade:1193 src/ui/gui/psppire.glade:2131
+#: src/ui/gui/psppire-var-store.c:486
 msgid "Numeric"
 msgstr "Nummer"
 
@@ -369,7 +369,7 @@ msgstr ""
 msgid "Invalid cell range \"%s\""
 msgstr ""
 
-#: src/data/gnumeric-reader.c:523
+#: src/data/gnumeric-reader.c:523 src/data/psql-reader.c:182
 #, c-format
 msgid "Cannot create variable name from %s"
 msgstr ""
@@ -588,6 +588,44 @@ msgstr ""
 msgid "An I/O error occurred writing portable file \"%s\"."
 msgstr ""
 
+#: src/data/psql-reader.c:41
+msgid ""
+"Support for reading postgres databases was not compiled into this "
+"installation of PSPP"
+msgstr ""
+
+#: src/data/psql-reader.c:216
+msgid "Memory error whilst opening psql source"
+msgstr ""
+
+#: src/data/psql-reader.c:222
+#, c-format
+msgid "Error opening psql source: %s."
+msgstr ""
+
+#: src/data/psql-reader.c:237
+#, c-format
+msgid ""
+"Postgres server is version %s. Reading from versions earlier than 8.0 is not "
+"supported."
+msgstr ""
+
+#: src/data/psql-reader.c:257
+msgid ""
+"Connection is unencrypted, but unencrypted connections have not been "
+"permitted."
+msgstr ""
+
+#: src/data/psql-reader.c:277 src/data/psql-reader.c:287
+#, c-format
+msgid "Error from psql source: %s."
+msgstr ""
+
+#: src/data/psql-reader.c:374
+#, c-format
+msgid "Unsupported OID %d.  SYSMIS values will be inserted."
+msgstr ""
+
 #: src/data/scratch-reader.c:54
 #, c-format
 msgid ""
@@ -1387,61 +1425,6 @@ msgstr ""
 msgid "Handle for %s not allowed here."
 msgstr ""
 
-#: src/language/data-io/get-data.c:61
-#, c-format
-msgid "Unsupported TYPE %s"
-msgstr ""
-
-#: src/language/data-io/get-data.c:250
-#, c-format
-msgid ""
-"%s is allowed only with %s arrangement, but %s arrangement was stated or "
-"implied earlier in this command."
-msgstr ""
-
-#: src/language/data-io/get-data.c:305
-msgid "expecting FIXED or DELIMITED"
-msgstr ""
-
-#: src/language/data-io/get-data.c:318
-msgid "Value of FIRSTCASE must be 1 or greater."
-msgstr ""
-
-#: src/language/data-io/get-data.c:343
-msgid "expecting LINE or VARIABLES"
-msgstr ""
-
-#: src/language/data-io/get-data.c:356
-msgid "Value of FIXCASE must be at least 1."
-msgstr ""
-
-#: src/language/data-io/get-data.c:376
-msgid "Value of FIRST must be at least 1."
-msgstr ""
-
-#: src/language/data-io/get-data.c:388
-msgid "Value of PERCENT must be between 1 and 100."
-msgstr ""
-
-#: src/language/data-io/get-data.c:441
-msgid "expecting VARIABLES"
-msgstr ""
-
-#: src/language/data-io/get-data.c:463
-#: src/language/data-io/placement-parser.c:376
-#, c-format
-msgid ""
-"The record number specified, %ld, is at or before the previous record, %d.  "
-"Data fields must be listed in order of increasing record number."
-msgstr ""
-
-#: src/language/data-io/get-data.c:472
-#, c-format
-msgid ""
-"The record number specified, %ld, exceeds the number of records per case "
-"specified on FIXCASE, %d."
-msgstr ""
-
 #: src/language/data-io/get.c:99
 msgid "expecting COMM or TAPE"
 msgstr ""
@@ -1531,6 +1514,61 @@ msgid ""
 "variable in earlier file (%s)."
 msgstr ""
 
+#: src/language/data-io/get-data.c:61
+#, c-format
+msgid "Unsupported TYPE %s"
+msgstr ""
+
+#: src/language/data-io/get-data.c:250
+#, c-format
+msgid ""
+"%s is allowed only with %s arrangement, but %s arrangement was stated or "
+"implied earlier in this command."
+msgstr ""
+
+#: src/language/data-io/get-data.c:305
+msgid "expecting FIXED or DELIMITED"
+msgstr ""
+
+#: src/language/data-io/get-data.c:318
+msgid "Value of FIRSTCASE must be 1 or greater."
+msgstr ""
+
+#: src/language/data-io/get-data.c:343
+msgid "expecting LINE or VARIABLES"
+msgstr ""
+
+#: src/language/data-io/get-data.c:356
+msgid "Value of FIXCASE must be at least 1."
+msgstr ""
+
+#: src/language/data-io/get-data.c:376
+msgid "Value of FIRST must be at least 1."
+msgstr ""
+
+#: src/language/data-io/get-data.c:388
+msgid "Value of PERCENT must be between 1 and 100."
+msgstr ""
+
+#: src/language/data-io/get-data.c:441
+msgid "expecting VARIABLES"
+msgstr ""
+
+#: src/language/data-io/get-data.c:463
+#: src/language/data-io/placement-parser.c:376
+#, c-format
+msgid ""
+"The record number specified, %ld, is at or before the previous record, %d.  "
+"Data fields must be listed in order of increasing record number."
+msgstr ""
+
+#: src/language/data-io/get-data.c:472
+#, c-format
+msgid ""
+"The record number specified, %ld, exceeds the number of records per case "
+"specified on FIXCASE, %d."
+msgstr ""
+
 #: src/language/data-io/inpt-pgm.c:129
 msgid "Unexpected end-of-file within INPUT PROGRAM."
 msgstr ""
@@ -1620,20 +1658,6 @@ msgstr ""
 msgid "The ending column for a field must be greater than the starting column."
 msgstr ""
 
-#: src/language/data-io/print-space.c:73 src/language/lexer/lexer.c:476
-#: src/language/stats/autorecode.c:154 src/language/xforms/select-if.c:60
-msgid "expecting end of command"
-msgstr ""
-
-#: src/language/data-io/print-space.c:116
-msgid "The expression on PRINT SPACE evaluated to the system-missing value."
-msgstr ""
-
-#: src/language/data-io/print-space.c:119
-#, c-format
-msgid "The expression on PRINT SPACE evaluated to %g."
-msgstr ""
-
 #: src/language/data-io/print.c:265
 #, c-format
 msgid "Output calls for %d records but %zu specified on RECORDS subcommand."
@@ -1653,6 +1677,20 @@ msgid_plural "Writing %d records."
 msgstr[0] ""
 msgstr[1] ""
 
+#: src/language/data-io/print-space.c:73 src/language/lexer/lexer.c:476
+#: src/language/stats/autorecode.c:154 src/language/xforms/select-if.c:60
+msgid "expecting end of command"
+msgstr ""
+
+#: src/language/data-io/print-space.c:116
+msgid "The expression on PRINT SPACE evaluated to the system-missing value."
+msgstr ""
+
+#: src/language/data-io/print-space.c:119
+#, c-format
+msgid "The expression on PRINT SPACE evaluated to %g."
+msgstr ""
+
 #: src/language/dictionary/apply-dictionary.c:75
 #, c-format
 msgid "Variable %s is %s in target file, but %s in source file."
@@ -3332,22 +3370,6 @@ msgstr ""
 msgid "TABLES subcommand may not appear more than once."
 msgstr ""
 
-#: src/language/stats/npar-summary.c:108
-msgid "Descriptive Statistics"
-msgstr ""
-
-#: src/language/stats/npar-summary.c:145
-msgid "25th"
-msgstr ""
-
-#: src/language/stats/npar-summary.c:148
-msgid "50th (Median)"
-msgstr ""
-
-#: src/language/stats/npar-summary.c:151
-msgid "75th"
-msgstr ""
-
 #: src/language/stats/npar.q:98
 msgid "NPAR subcommand not currently implemented."
 msgstr ""
@@ -3372,6 +3394,22 @@ msgid ""
 "not match the number following (%zu)."
 msgstr ""
 
+#: src/language/stats/npar-summary.c:108
+msgid "Descriptive Statistics"
+msgstr ""
+
+#: src/language/stats/npar-summary.c:145
+msgid "25th"
+msgstr ""
+
+#: src/language/stats/npar-summary.c:148
+msgid "50th (Median)"
+msgstr ""
+
+#: src/language/stats/npar-summary.c:151
+msgid "75th"
+msgstr ""
+
 #: src/language/stats/oneway.q:169
 msgid "Number of contrast coefficients must equal the number of groups"
 msgstr ""
@@ -5394,33 +5432,6 @@ msgstr "xyzzy"
 msgid "Paste"
 msgstr "Datum"
 
-#: src/ui/gui/psppire-data-store.c:833
-msgid "var"
-msgstr ""
-
-#: src/ui/gui/psppire-data-store.c:954 src/ui/gui/psppire-var-store.c:728
-#, c-format
-msgid "%ld"
-msgstr ""
-
-#: src/ui/gui/psppire-var-store.c:479 src/ui/gui/var-display.c:14
-msgid "None"
-msgstr "Keine"
-
-#: src/ui/gui/psppire-var-store.c:489
-msgid "Scientific"
-msgstr "Wissenschäflich"
-
-#: src/ui/gui/psppire-var-store.c:492
-msgid "Custom"
-msgstr "Spezial"
-
-#: src/ui/gui/psppire-var-store.c:563 src/ui/gui/psppire-var-store.c:573
-#: src/ui/gui/psppire-var-store.c:583
-#, c-format
-msgid "%d"
-msgstr ""
-
 #: src/ui/gui/psppire.c:197
 msgid "_Reset"
 msgstr "_Zurücksetzen"
@@ -5430,6 +5441,15 @@ msgstr "_Zurücksetzen"
 msgid "_Select"
 msgstr "Schriftwahlung"
 
+#: src/ui/gui/psppire-data-store.c:833
+msgid "var"
+msgstr ""
+
+#: src/ui/gui/psppire-data-store.c:954 src/ui/gui/psppire-var-store.c:728
+#, c-format
+msgid "%ld"
+msgstr ""
+
 #: src/ui/gui/psppire.glade:11
 #, fuzzy
 msgid "This is pre-alpha software.  Use at your own risk."
@@ -5669,6 +5689,24 @@ msgstr ""
 msgid "Search backward"
 msgstr ""
 
+#: src/ui/gui/psppire-var-store.c:479 src/ui/gui/var-display.c:14
+msgid "None"
+msgstr "Keine"
+
+#: src/ui/gui/psppire-var-store.c:489
+msgid "Scientific"
+msgstr "Wissenschäflich"
+
+#: src/ui/gui/psppire-var-store.c:492
+msgid "Custom"
+msgstr "Spezial"
+
+#: src/ui/gui/psppire-var-store.c:563 src/ui/gui/psppire-var-store.c:573
+#: src/ui/gui/psppire-var-store.c:583
+#, c-format
+msgid "%d"
+msgstr ""
+
 #: src/ui/gui/rank.glade:111
 msgid "By:"
 msgstr ""
@@ -5948,19 +5986,6 @@ msgstr ""
 msgid "To End"
 msgstr ""
 
-#: src/ui/gui/t-test-options.c:60
-#, c-format
-msgid "Confidence Interval: %2d %%"
-msgstr ""
-
-#: src/ui/gui/t-test-paired-samples.c:232
-msgid "Var 1"
-msgstr ""
-
-#: src/ui/gui/t-test-paired-samples.c:233
-msgid "Var 2"
-msgstr ""
-
 #: src/ui/gui/t-test.glade:56 src/ui/gui/t-test.glade:165
 msgid "Define Groups"
 msgstr ""
@@ -6005,25 +6030,18 @@ msgstr ""
 msgid "Test Value: "
 msgstr "Werte:"
 
-#: src/ui/gui/var-sheet.c:65
-msgid "Name"
-msgstr "Name"
-
-#: src/ui/gui/var-sheet.c:68
-msgid "Decimals"
-msgstr "Dezimalstellen"
-
-#: src/ui/gui/var-sheet.c:70
-msgid "Values"
-msgstr "Werten"
+#: src/ui/gui/t-test-options.c:60
+#, c-format
+msgid "Confidence Interval: %2d %%"
+msgstr ""
 
-#: src/ui/gui/var-sheet.c:73
-msgid "Align"
-msgstr "Einstellung"
+#: src/ui/gui/t-test-paired-samples.c:232
+msgid "Var 1"
+msgstr ""
 
-#: src/ui/gui/var-sheet.c:74
-msgid "Measure"
-msgstr "Messe"
+#: src/ui/gui/t-test-paired-samples.c:233
+msgid "Var 2"
+msgstr ""
 
 #: src/ui/gui/variable-info-dialog.c:88
 #, fuzzy, c-format
@@ -6055,6 +6073,26 @@ msgstr "Werten"
 msgid "%s %s\n"
 msgstr ""
 
+#: src/ui/gui/var-sheet.c:65
+msgid "Name"
+msgstr "Name"
+
+#: src/ui/gui/var-sheet.c:68
+msgid "Decimals"
+msgstr "Dezimalstellen"
+
+#: src/ui/gui/var-sheet.c:70
+msgid "Values"
+msgstr "Werten"
+
+#: src/ui/gui/var-sheet.c:73
+msgid "Align"
+msgstr "Einstellung"
+
+#: src/ui/gui/var-sheet.c:74
+msgid "Measure"
+msgstr "Messe"
+
 #: src/ui/gui/weight-cases-dialog.c:88
 #, c-format
 msgid "Weight cases by %s"

diff --git a/po/en_GB.po b/po/en_GB.po
index 00dbb6cb33ea5325a7f508d2eea7d513b565bac6..e1c768f0b55fac1f15e9c47c8a2a449616cd7785 100644 (file)
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PSPP 0.4.3\n"
 "Report-Msgid-Bugs-To: pspp-dev@gnu.org\n"
-"POT-Creation-Date: 2008-02-04 18:26+0900\n"
+"POT-Creation-Date: 2008-02-05 07:19+0900\n"
 "PO-Revision-Date: 2007-09-15 08:29+0800\n"
 "Last-Translator: John Darrington <john@darrington.wattle.id.au>\n"
 "Language-Team: John Darrington <john@darrington.wattle.id.au>\n"
@@ -44,6 +44,12 @@ msgstr ""
 msgid "Date %04d-%d-%d is before the earliest acceptable date of 1582-10-15."
 msgstr ""
 
+#: src/data/casereader-filter.c:221
+msgid ""
+"At least one case in the data read had a weight value that was user-missing, "
+"system-missing, zero, or negative.  These case(s) were ignored."
+msgstr ""
+
 #: src/data/case-tmpfile.c:57
 msgid "failed to create temporary file"
 msgstr ""
@@ -64,12 +70,6 @@ msgstr ""
 msgid "writing to temporary file"
 msgstr ""
 
-#: src/data/casereader-filter.c:221
-msgid ""
-"At least one case in the data read had a weight value that was user-missing, "
-"system-missing, zero, or negative.  These case(s) were ignored."
-msgstr ""
-
 #: src/data/data-in.c:254 src/data/data-in.c:444
 msgid "Field contents are not numeric."
 msgstr ""
@@ -315,14 +315,14 @@ msgid "%s variables are not compatible with %s format %s."
 msgstr ""
 
 #: src/data/format.c:330 src/data/sys-file-reader.c:639
-#: src/ui/gui/data-editor.glade:1304 src/ui/gui/psppire-var-store.c:493
-#: src/ui/gui/psppire.glade:2176
+#: src/ui/gui/data-editor.glade:1304 src/ui/gui/psppire.glade:2176
+#: src/ui/gui/psppire-var-store.c:493
 msgid "String"
 msgstr ""
 
 #: src/data/format.c:330 src/data/sys-file-reader.c:639
-#: src/ui/gui/data-editor.glade:1193 src/ui/gui/psppire-var-store.c:486
-#: src/ui/gui/psppire.glade:2131
+#: src/ui/gui/data-editor.glade:1193 src/ui/gui/psppire.glade:2131
+#: src/ui/gui/psppire-var-store.c:486
 msgid "Numeric"
 msgstr ""
 
@@ -364,7 +364,7 @@ msgstr ""
 msgid "Invalid cell range \"%s\""
 msgstr ""
 
-#: src/data/gnumeric-reader.c:523
+#: src/data/gnumeric-reader.c:523 src/data/psql-reader.c:182
 #, c-format
 msgid "Cannot create variable name from %s"
 msgstr ""
@@ -582,6 +582,44 @@ msgstr ""
 msgid "An I/O error occurred writing portable file \"%s\"."
 msgstr ""
 
+#: src/data/psql-reader.c:41
+msgid ""
+"Support for reading postgres databases was not compiled into this "
+"installation of PSPP"
+msgstr ""
+
+#: src/data/psql-reader.c:216
+msgid "Memory error whilst opening psql source"
+msgstr ""
+
+#: src/data/psql-reader.c:222
+#, c-format
+msgid "Error opening psql source: %s."
+msgstr ""
+
+#: src/data/psql-reader.c:237
+#, c-format
+msgid ""
+"Postgres server is version %s. Reading from versions earlier than 8.0 is not "
+"supported."
+msgstr ""
+
+#: src/data/psql-reader.c:257
+msgid ""
+"Connection is unencrypted, but unencrypted connections have not been "
+"permitted."
+msgstr ""
+
+#: src/data/psql-reader.c:277 src/data/psql-reader.c:287
+#, c-format
+msgid "Error from psql source: %s."
+msgstr ""
+
+#: src/data/psql-reader.c:374
+#, c-format
+msgid "Unsupported OID %d.  SYSMIS values will be inserted."
+msgstr ""
+
 #: src/data/scratch-reader.c:54
 #, c-format
 msgid ""
@@ -1378,61 +1416,6 @@ msgstr ""
 msgid "Handle for %s not allowed here."
 msgstr ""
 
-#: src/language/data-io/get-data.c:61
-#, c-format
-msgid "Unsupported TYPE %s"
-msgstr ""
-
-#: src/language/data-io/get-data.c:250
-#, c-format
-msgid ""
-"%s is allowed only with %s arrangement, but %s arrangement was stated or "
-"implied earlier in this command."
-msgstr ""
-
-#: src/language/data-io/get-data.c:305
-msgid "expecting FIXED or DELIMITED"
-msgstr ""
-
-#: src/language/data-io/get-data.c:318
-msgid "Value of FIRSTCASE must be 1 or greater."
-msgstr ""
-
-#: src/language/data-io/get-data.c:343
-msgid "expecting LINE or VARIABLES"
-msgstr ""
-
-#: src/language/data-io/get-data.c:356
-msgid "Value of FIXCASE must be at least 1."
-msgstr ""
-
-#: src/language/data-io/get-data.c:376
-msgid "Value of FIRST must be at least 1."
-msgstr ""
-
-#: src/language/data-io/get-data.c:388
-msgid "Value of PERCENT must be between 1 and 100."
-msgstr ""
-
-#: src/language/data-io/get-data.c:441
-msgid "expecting VARIABLES"
-msgstr ""
-
-#: src/language/data-io/get-data.c:463
-#: src/language/data-io/placement-parser.c:376
-#, c-format
-msgid ""
-"The record number specified, %ld, is at or before the previous record, %d.  "
-"Data fields must be listed in order of increasing record number."
-msgstr ""
-
-#: src/language/data-io/get-data.c:472
-#, c-format
-msgid ""
-"The record number specified, %ld, exceeds the number of records per case "
-"specified on FIXCASE, %d."
-msgstr ""
-
 #: src/language/data-io/get.c:99
 msgid "expecting COMM or TAPE"
 msgstr ""
@@ -1522,6 +1505,61 @@ msgid ""
 "variable in earlier file (%s)."
 msgstr ""
 
+#: src/language/data-io/get-data.c:61
+#, c-format
+msgid "Unsupported TYPE %s"
+msgstr ""
+
+#: src/language/data-io/get-data.c:250
+#, c-format
+msgid ""
+"%s is allowed only with %s arrangement, but %s arrangement was stated or "
+"implied earlier in this command."
+msgstr ""
+
+#: src/language/data-io/get-data.c:305
+msgid "expecting FIXED or DELIMITED"
+msgstr ""
+
+#: src/language/data-io/get-data.c:318
+msgid "Value of FIRSTCASE must be 1 or greater."
+msgstr ""
+
+#: src/language/data-io/get-data.c:343
+msgid "expecting LINE or VARIABLES"
+msgstr ""
+
+#: src/language/data-io/get-data.c:356
+msgid "Value of FIXCASE must be at least 1."
+msgstr ""
+
+#: src/language/data-io/get-data.c:376
+msgid "Value of FIRST must be at least 1."
+msgstr ""
+
+#: src/language/data-io/get-data.c:388
+msgid "Value of PERCENT must be between 1 and 100."
+msgstr ""
+
+#: src/language/data-io/get-data.c:441
+msgid "expecting VARIABLES"
+msgstr ""
+
+#: src/language/data-io/get-data.c:463
+#: src/language/data-io/placement-parser.c:376
+#, c-format
+msgid ""
+"The record number specified, %ld, is at or before the previous record, %d.  "
+"Data fields must be listed in order of increasing record number."
+msgstr ""
+
+#: src/language/data-io/get-data.c:472
+#, c-format
+msgid ""
+"The record number specified, %ld, exceeds the number of records per case "
+"specified on FIXCASE, %d."
+msgstr ""
+
 #: src/language/data-io/inpt-pgm.c:129
 msgid "Unexpected end-of-file within INPUT PROGRAM."
 msgstr ""
@@ -1611,20 +1649,6 @@ msgstr ""
 msgid "The ending column for a field must be greater than the starting column."
 msgstr ""
 
-#: src/language/data-io/print-space.c:73 src/language/lexer/lexer.c:476
-#: src/language/stats/autorecode.c:154 src/language/xforms/select-if.c:60
-msgid "expecting end of command"
-msgstr ""
-
-#: src/language/data-io/print-space.c:116
-msgid "The expression on PRINT SPACE evaluated to the system-missing value."
-msgstr ""
-
-#: src/language/data-io/print-space.c:119
-#, c-format
-msgid "The expression on PRINT SPACE evaluated to %g."
-msgstr ""
-
 #: src/language/data-io/print.c:265
 #, c-format
 msgid "Output calls for %d records but %zu specified on RECORDS subcommand."
@@ -1644,6 +1668,20 @@ msgid_plural "Writing %d records."
 msgstr[0] ""
 msgstr[1] ""
 
+#: src/language/data-io/print-space.c:73 src/language/lexer/lexer.c:476
+#: src/language/stats/autorecode.c:154 src/language/xforms/select-if.c:60
+msgid "expecting end of command"
+msgstr ""
+
+#: src/language/data-io/print-space.c:116
+msgid "The expression on PRINT SPACE evaluated to the system-missing value."
+msgstr ""
+
+#: src/language/data-io/print-space.c:119
+#, c-format
+msgid "The expression on PRINT SPACE evaluated to %g."
+msgstr ""
+
 #: src/language/dictionary/apply-dictionary.c:75
 #, c-format
 msgid "Variable %s is %s in target file, but %s in source file."
@@ -3323,22 +3361,6 @@ msgstr ""
 msgid "TABLES subcommand may not appear more than once."
 msgstr ""
 
-#: src/language/stats/npar-summary.c:108
-msgid "Descriptive Statistics"
-msgstr ""
-
-#: src/language/stats/npar-summary.c:145
-msgid "25th"
-msgstr ""
-
-#: src/language/stats/npar-summary.c:148
-msgid "50th (Median)"
-msgstr ""
-
-#: src/language/stats/npar-summary.c:151
-msgid "75th"
-msgstr ""
-
 #: src/language/stats/npar.q:98
 msgid "NPAR subcommand not currently implemented."
 msgstr ""
@@ -3363,6 +3385,22 @@ msgid ""
 "not match the number following (%zu)."
 msgstr ""
 
+#: src/language/stats/npar-summary.c:108
+msgid "Descriptive Statistics"
+msgstr ""
+
+#: src/language/stats/npar-summary.c:145
+msgid "25th"
+msgstr ""
+
+#: src/language/stats/npar-summary.c:148
+msgid "50th (Median)"
+msgstr ""
+
+#: src/language/stats/npar-summary.c:151
+msgid "75th"
+msgstr ""
+
 #: src/language/stats/oneway.q:169
 msgid "Number of contrast coefficients must equal the number of groups"
 msgstr ""
@@ -5338,39 +5376,21 @@ msgstr ""
 msgid "Paste"
 msgstr ""
 
-#: src/ui/gui/psppire-data-store.c:833
-msgid "var"
-msgstr ""
-
-#: src/ui/gui/psppire-data-store.c:954 src/ui/gui/psppire-var-store.c:728
-#, c-format
-msgid "%ld"
-msgstr ""
-
-#: src/ui/gui/psppire-var-store.c:479 src/ui/gui/var-display.c:14
-msgid "None"
+#: src/ui/gui/psppire.c:197
+msgid "_Reset"
 msgstr ""
 
-#: src/ui/gui/psppire-var-store.c:489
-msgid "Scientific"
+#: src/ui/gui/psppire.c:198
+msgid "_Select"
 msgstr ""
 
-#: src/ui/gui/psppire-var-store.c:492
-msgid "Custom"
+#: src/ui/gui/psppire-data-store.c:833
+msgid "var"
 msgstr ""
 
-#: src/ui/gui/psppire-var-store.c:563 src/ui/gui/psppire-var-store.c:573
-#: src/ui/gui/psppire-var-store.c:583
+#: src/ui/gui/psppire-data-store.c:954 src/ui/gui/psppire-var-store.c:728
 #, c-format
-msgid "%d"
-msgstr ""
-
-#: src/ui/gui/psppire.c:197
-msgid "_Reset"
-msgstr ""
-
-#: src/ui/gui/psppire.c:198
-msgid "_Select"
+msgid "%ld"
 msgstr ""
 
 #: src/ui/gui/psppire.glade:11
@@ -5597,6 +5617,24 @@ msgstr ""
 msgid "Search backward"
 msgstr ""
 
+#: src/ui/gui/psppire-var-store.c:479 src/ui/gui/var-display.c:14
+msgid "None"
+msgstr ""
+
+#: src/ui/gui/psppire-var-store.c:489
+msgid "Scientific"
+msgstr ""
+
+#: src/ui/gui/psppire-var-store.c:492
+msgid "Custom"
+msgstr ""
+
+#: src/ui/gui/psppire-var-store.c:563 src/ui/gui/psppire-var-store.c:573
+#: src/ui/gui/psppire-var-store.c:583
+#, c-format
+msgid "%d"
+msgstr ""
+
 #: src/ui/gui/rank.glade:111
 msgid "By:"
 msgstr ""
@@ -5853,19 +5891,6 @@ msgstr ""
 msgid "To End"
 msgstr ""
 
-#: src/ui/gui/t-test-options.c:60
-#, c-format
-msgid "Confidence Interval: %2d %%"
-msgstr ""
-
-#: src/ui/gui/t-test-paired-samples.c:232
-msgid "Var 1"
-msgstr ""
-
-#: src/ui/gui/t-test-paired-samples.c:233
-msgid "Var 2"
-msgstr ""
-
 #: src/ui/gui/t-test.glade:56 src/ui/gui/t-test.glade:165
 msgid "Define Groups"
 msgstr ""
@@ -5908,24 +5933,17 @@ msgstr ""
 msgid "Test Value: "
 msgstr ""
 
-#: src/ui/gui/var-sheet.c:65
-msgid "Name"
-msgstr ""
-
-#: src/ui/gui/var-sheet.c:68
-msgid "Decimals"
-msgstr ""
-
-#: src/ui/gui/var-sheet.c:70
-msgid "Values"
+#: src/ui/gui/t-test-options.c:60
+#, c-format
+msgid "Confidence Interval: %2d %%"
 msgstr ""
 
-#: src/ui/gui/var-sheet.c:73
-msgid "Align"
+#: src/ui/gui/t-test-paired-samples.c:232
+msgid "Var 1"
 msgstr ""
 
-#: src/ui/gui/var-sheet.c:74
-msgid "Measure"
+#: src/ui/gui/t-test-paired-samples.c:233
+msgid "Var 2"
 msgstr ""
 
 #: src/ui/gui/variable-info-dialog.c:88
@@ -5957,6 +5975,26 @@ msgstr ""
 msgid "%s %s\n"
 msgstr ""
 
+#: src/ui/gui/var-sheet.c:65
+msgid "Name"
+msgstr ""
+
+#: src/ui/gui/var-sheet.c:68
+msgid "Decimals"
+msgstr ""
+
+#: src/ui/gui/var-sheet.c:70
+msgid "Values"
+msgstr ""
+
+#: src/ui/gui/var-sheet.c:73
+msgid "Align"
+msgstr ""
+
+#: src/ui/gui/var-sheet.c:74
+msgid "Measure"
+msgstr ""
+
 #: src/ui/gui/weight-cases-dialog.c:88
 #, c-format
 msgid "Weight cases by %s"

diff --git a/src/data/ChangeLog b/src/data/ChangeLog
index 012ffaf52a9c8e02de42ec0ea71a8c23c6531a95..6ab0bb443ab53d862ba64eb50208bfb8ac4e7bf7 100644 (file)
--- a/src/data/ChangeLog
+++ b/src/data/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-05  John Darrington <john@darrington.wattle.id.au>
+
+       psql-reader.c: So yesterday they release postgresql 8.3.0
+       which has money represented with 64 bits.  They must get
+       paid more than me.
+
 2008-02-02  John Darrington <john@darrington.wattle.id.au>
 
        psql-reader.c psql-reader.h: New files.  Thanks to Ben Pfaff

diff --git a/src/data/psql-reader.c b/src/data/psql-reader.c
index 20aa57dbfc17f28a8c342e763e137c4580d35fcb..f59bcb6dac8521cba01d026ca5cf1a54a524d367 100644 (file)
--- a/src/data/psql-reader.c
+++ b/src/data/psql-reader.c
@@ -589,9 +589,28 @@ set_value (const struct psql_reader *r,
 
            case CASHOID:
              {
-               int32_t x;
-               GET_VALUE (&vptr, x);
-               val->f = x / 100.0;
+               /* Postgres 8.3 uses 64 bits.
+                  Earlier versions use 32 */
+               switch (length)
+                 {
+                 case 8:
+                   {
+                     int64_t x;
+                     GET_VALUE (&vptr, x);
+                     val->f = x / 100.0;
+                   }
+                   break;
+                 case 4:
+                   {
+                     int32_t x;
+                     GET_VALUE (&vptr, x);
+                     val->f = x / 100.0;
+                   }
+                   break;
+                 default:
+                   val->f = SYSMIS;
+                   break;
+                 }
              }
              break;