[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pspp-cvs] pspp po/de.po po/pspp.pot src/data/ChangeLog sr...
|
From: |
John Darrington |
|
Subject: |
[Pspp-cvs] pspp po/de.po po/pspp.pot src/data/ChangeLog sr... |
|
Date: |
Mon, 01 Jan 2007 01:44:33 +0000 |
CVSROOT: /sources/pspp
Module name: pspp
Changes by: John Darrington <jmd> 07/01/01 01:44:33
Modified files:
po : de.po pspp.pot
src/data : ChangeLog dictionary.c dictionary.h procedure.c
procedure.h
src/language/expressions: evaluate.c
src/ui/gui : ChangeLog psppire-case-file.c
psppire-case-file.h psppire-data-store.c
psppire-dict.c psppire-dict.h psppire.c
syntax-editor.c
src/ui/terminal: main.c
Log message:
Applied patch #5653, which adds callbacks to dataset whenever its
dictionary or
data source is replaced.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/po/de.po?cvsroot=pspp&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/pspp/po/pspp.pot?cvsroot=pspp&r1=1.115&r2=1.116
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/ChangeLog?cvsroot=pspp&r1=1.94&r2=1.95
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/dictionary.c?cvsroot=pspp&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/dictionary.h?cvsroot=pspp&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/procedure.c?cvsroot=pspp&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/procedure.h?cvsroot=pspp&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/expressions/evaluate.c?cvsroot=pspp&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/ChangeLog?cvsroot=pspp&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/psppire-case-file.c?cvsroot=pspp&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/psppire-case-file.h?cvsroot=pspp&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/psppire-data-store.c?cvsroot=pspp&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/psppire-dict.c?cvsroot=pspp&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/psppire-dict.h?cvsroot=pspp&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/psppire.c?cvsroot=pspp&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/syntax-editor.c?cvsroot=pspp&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/terminal/main.c?cvsroot=pspp&r1=1.28&r2=1.29
Patches:
Index: po/de.po
===================================================================
RCS file: /sources/pspp/pspp/po/de.po,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- po/de.po 29 Dec 2006 04:19:36 -0000 1.31
+++ po/de.po 1 Jan 2007 01:44:33 -0000 1.32
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: PSPP 0.4.2\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-12-28 20:05+0900\n"
+"POT-Creation-Date: 2006-12-29 15:57+0900\n"
"PO-Revision-Date: 2006-05-26 17:49+0800\n"
"Last-Translator: John Darrington <address@hidden>\n"
"Language-Team: German <address@hidden>\n"
@@ -176,13 +176,13 @@
msgid "Month number %f is not between 1 and 12."
msgstr ""
-#: src/data/dictionary.c:709
+#: src/data/dictionary.c:721
msgid ""
"At least one case in the data file had a weight value that was user-missing, "
"system-missing, zero, or negative. These case(s) were ignored."
msgstr ""
-#: src/data/dictionary.c:1189
+#: src/data/dictionary.c:1201
msgid "Variable suffix too large."
msgstr ""
@@ -309,13 +309,13 @@
msgstr ""
#: src/data/format.c:310 src/data/por-file-reader.c:489
-#: src/data/sys-file-reader.c:602 src/ui/gui/data-editor.glade:1247
+#: src/data/sys-file-reader.c:602 src/ui/gui/data-editor.glade:1558
#: src/ui/gui/psppire-var-store.c:482
msgid "String"
msgstr "Zeichenkette"
#: src/data/format.c:310 src/data/por-file-reader.c:489
-#: src/data/sys-file-reader.c:602 src/ui/gui/data-editor.glade:1108
+#: src/data/sys-file-reader.c:602 src/ui/gui/data-editor.glade:1419
#: src/ui/gui/psppire-var-store.c:475
msgid "Numeric"
msgstr "Nummer"
@@ -4098,28 +4098,28 @@
"bad box: (%d+%d=%d,%d+%d=%d)-(%d+%d=%d,%d+%d=%d) in table size (%d,%d)\n"
msgstr ""
-#: src/ui/gui/customentry.c:337 src/ui/gui/psppire-status-bar.c:252
+#: src/ui/gui/customentry.c:337
msgid "Style of bevel around the custom entry button"
msgstr ""
-#: src/ui/gui/data-editor.c:369 src/ui/gui/data-editor.glade:531
+#: src/ui/gui/data-editor.c:368 src/ui/gui/data-editor.glade:531
msgid "Open"
msgstr "Ãffen"
-#: src/ui/gui/data-editor.c:377
+#: src/ui/gui/data-editor.c:376
msgid "System Files (*.sav)"
msgstr "Systemedatein (*.sav)"
-#: src/ui/gui/data-editor.c:383
+#: src/ui/gui/data-editor.c:382
msgid "Portable Files (*.por) "
msgstr "Tragbardatein (*.por)"
-#: src/ui/gui/data-editor.c:389 src/ui/gui/syntax-editor.c:140
-#: src/ui/gui/syntax-editor.c:541
+#: src/ui/gui/data-editor.c:388 src/ui/gui/syntax-editor.c:140
+#: src/ui/gui/syntax-editor.c:538
msgid "All Files"
msgstr "Alle Datei"
-#: src/ui/gui/data-editor.c:467
+#: src/ui/gui/data-editor.c:466
msgid "Font Selection"
msgstr "Schriftwahlung"
@@ -4178,7 +4178,7 @@
msgstr "Glitten"
#: src/ui/gui/data-editor.glade:278 src/ui/gui/data-editor.glade:831
-#: src/ui/gui/data-editor.glade:1682 src/ui/gui/data-editor.glade:1959
+#: src/ui/gui/data-editor.glade:1993 src/ui/gui/data-editor.glade:2270
msgid "Value Labels"
msgstr "Werten"
@@ -4201,11 +4201,11 @@
msgstr "_Stecken"
#: src/ui/gui/data-editor.glade:343 src/ui/gui/data-editor.glade:638
-#: src/ui/gui/data-editor.glade:2524
+#: src/ui/gui/data-editor.glade:2835
msgid "Go To Case"
msgstr ""
-#: src/ui/gui/data-editor.glade:372 src/ui/gui/data-editor.glade:2635
+#: src/ui/gui/data-editor.glade:372 src/ui/gui/data-editor.glade:2946
msgid "Sort Cases"
msgstr ""
@@ -4297,107 +4297,136 @@
msgid "Variable View"
msgstr "Variableansicht"
-#: src/ui/gui/data-editor.glade:1075
+#: src/ui/gui/data-editor.glade:1079
+msgid "Information Area"
+msgstr ""
+
+#: src/ui/gui/data-editor.glade:1126
+msgid "Processor Area"
+msgstr ""
+
+#: src/ui/gui/data-editor.glade:1169
+msgid "OMS Area"
+msgstr ""
+
+#: src/ui/gui/data-editor.glade:1212
+msgid "Case Counter Area"
+msgstr ""
+
+#: src/ui/gui/data-editor.glade:1255
+msgid "Filter Use Status Area"
+msgstr ""
+
+#: src/ui/gui/data-editor.glade:1298
+msgid "Weight Status Area"
+msgstr ""
+
+#: src/ui/gui/data-editor.glade:1341
+#, fuzzy
+msgid "Split File Status Area"
+msgstr "Alle Datei"
+
+#: src/ui/gui/data-editor.glade:1386
msgid "Variable Type"
msgstr "Variableansicht"
-#: src/ui/gui/data-editor.glade:1127 src/ui/gui/psppire-var-store.c:476
+#: src/ui/gui/data-editor.glade:1438 src/ui/gui/psppire-var-store.c:476
msgid "Comma"
msgstr "Komma"
-#: src/ui/gui/data-editor.glade:1147 src/ui/gui/psppire-var-store.c:477
+#: src/ui/gui/data-editor.glade:1458 src/ui/gui/psppire-var-store.c:477
msgid "Dot"
msgstr "Punkt"
-#: src/ui/gui/data-editor.glade:1167
+#: src/ui/gui/data-editor.glade:1478
msgid "Scientific notation"
msgstr "Wissenschaftlichnotation"
-#: src/ui/gui/data-editor.glade:1187 src/ui/gui/psppire-var-store.c:479
+#: src/ui/gui/data-editor.glade:1498 src/ui/gui/psppire-var-store.c:479
msgid "Date"
msgstr "Datum"
-#: src/ui/gui/data-editor.glade:1207 src/ui/gui/psppire-var-store.c:480
+#: src/ui/gui/data-editor.glade:1518 src/ui/gui/psppire-var-store.c:480
msgid "Dollar"
msgstr "Euro"
-#: src/ui/gui/data-editor.glade:1227
+#: src/ui/gui/data-editor.glade:1538
msgid "Custom currency"
msgstr "Spezialwährung"
-#: src/ui/gui/data-editor.glade:1372
+#: src/ui/gui/data-editor.glade:1683
msgid "positive"
msgstr "positiv"
-#: src/ui/gui/data-editor.glade:1397
+#: src/ui/gui/data-editor.glade:1708
msgid "negative"
msgstr "negativ"
-#: src/ui/gui/data-editor.glade:1426
+#: src/ui/gui/data-editor.glade:1737
msgid "Sample"
msgstr "Muster"
-#: src/ui/gui/data-editor.glade:1504
+#: src/ui/gui/data-editor.glade:1815
msgid "Decimal Places:"
msgstr "Dezimalstellen:"
-#: src/ui/gui/data-editor.glade:1581
+#: src/ui/gui/data-editor.glade:1892
msgid "Width:"
msgstr "GroÃe:"
-#: src/ui/gui/data-editor.glade:1800
+#: src/ui/gui/data-editor.glade:2111
msgid "Value:"
msgstr "Werte:"
-#: src/ui/gui/data-editor.glade:1828
+#: src/ui/gui/data-editor.glade:2139
msgid "Value Label:"
msgstr "Kennsatz:"
-#: src/ui/gui/data-editor.glade:2044
+#: src/ui/gui/data-editor.glade:2355
msgid "Missing Values"
msgstr "Lösewerten"
-#: src/ui/gui/data-editor.glade:2130
+#: src/ui/gui/data-editor.glade:2441
msgid "_No missing values"
msgstr "_Kein Lösewerten"
-#: src/ui/gui/data-editor.glade:2155
+#: src/ui/gui/data-editor.glade:2466
msgid "_Discrete missing values"
msgstr "_Diskret Lösewerten"
-#: src/ui/gui/data-editor.glade:2284
+#: src/ui/gui/data-editor.glade:2595
msgid "_Range plus one optional discrete missing value"
msgstr "Wertebereich und ein optional Lösewert"
-#: src/ui/gui/data-editor.glade:2321
+#: src/ui/gui/data-editor.glade:2632
msgid "_Low:"
msgstr "_Tief:"
-#: src/ui/gui/data-editor.glade:2380
+#: src/ui/gui/data-editor.glade:2691
msgid "_High:"
msgstr "_Hoch:"
-#: src/ui/gui/data-editor.glade:2454
+#: src/ui/gui/data-editor.glade:2765
msgid "Di_screte value:"
msgstr "Di_skretwerte"
-#: src/ui/gui/data-editor.glade:2580
+#: src/ui/gui/data-editor.glade:2891
msgid "Case Number:"
msgstr ""
-#: src/ui/gui/data-editor.glade:2752 src/ui/gui/sort-cases-dialog.c:279
+#: src/ui/gui/data-editor.glade:3063 src/ui/gui/sort-cases-dialog.c:279
msgid "Ascending"
msgstr ""
-#: src/ui/gui/data-editor.glade:2771 src/ui/gui/sort-cases-dialog.c:281
+#: src/ui/gui/data-editor.glade:3082 src/ui/gui/sort-cases-dialog.c:281
msgid "Descending"
msgstr ""
-#: src/ui/gui/data-editor.glade:2792
+#: src/ui/gui/data-editor.glade:3103
msgid "Sort Order"
msgstr ""
-#: src/ui/gui/data-editor.glade:2829
+#: src/ui/gui/data-editor.glade:3140
msgid "Sort by:"
msgstr ""
@@ -4445,11 +4474,11 @@
msgid "Incorrect range specification"
msgstr "Falshe Spannweitebeschreibung"
-#: src/ui/gui/psppire-data-store.c:745
+#: src/ui/gui/psppire-data-store.c:743
msgid "var"
msgstr ""
-#: src/ui/gui/psppire-data-store.c:826 src/ui/gui/psppire-var-store.c:552
+#: src/ui/gui/psppire-data-store.c:824 src/ui/gui/psppire-var-store.c:552
#: src/ui/gui/psppire-var-store.c:562 src/ui/gui/psppire-var-store.c:572
#: src/ui/gui/psppire-var-store.c:770
#, c-format
@@ -4508,12 +4537,12 @@
msgid "Save Syntax"
msgstr "Speichern unter"
-#: src/ui/gui/syntax-editor.c:134 src/ui/gui/syntax-editor.c:535
+#: src/ui/gui/syntax-editor.c:134 src/ui/gui/syntax-editor.c:532
#, fuzzy
msgid "Syntax Files (*.sps) "
msgstr "Systemedatein (*.sav)"
-#: src/ui/gui/syntax-editor.c:527
+#: src/ui/gui/syntax-editor.c:524
msgid "Open Syntax"
msgstr ""
Index: po/pspp.pot
===================================================================
RCS file: /sources/pspp/pspp/po/pspp.pot,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -b -r1.115 -r1.116
--- po/pspp.pot 29 Dec 2006 04:19:36 -0000 1.115
+++ po/pspp.pot 1 Jan 2007 01:44:33 -0000 1.116
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-12-28 20:05+0900\n"
+"POT-Creation-Date: 2006-12-29 15:57+0900\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <address@hidden>\n"
"Language-Team: LANGUAGE <address@hidden>\n"
@@ -175,13 +175,13 @@
msgid "Month number %f is not between 1 and 12."
msgstr ""
-#: src/data/dictionary.c:709
+#: src/data/dictionary.c:721
msgid ""
"At least one case in the data file had a weight value that was user-missing, "
"system-missing, zero, or negative. These case(s) were ignored."
msgstr ""
-#: src/data/dictionary.c:1189
+#: src/data/dictionary.c:1201
msgid "Variable suffix too large."
msgstr ""
@@ -308,13 +308,13 @@
msgstr ""
#: src/data/format.c:310 src/data/por-file-reader.c:489
-#: src/data/sys-file-reader.c:602 src/ui/gui/data-editor.glade:1247
+#: src/data/sys-file-reader.c:602 src/ui/gui/data-editor.glade:1558
#: src/ui/gui/psppire-var-store.c:482
msgid "String"
msgstr ""
#: src/data/format.c:310 src/data/por-file-reader.c:489
-#: src/data/sys-file-reader.c:602 src/ui/gui/data-editor.glade:1108
+#: src/data/sys-file-reader.c:602 src/ui/gui/data-editor.glade:1419
#: src/ui/gui/psppire-var-store.c:475
msgid "Numeric"
msgstr ""
@@ -4093,28 +4093,28 @@
"bad box: (%d+%d=%d,%d+%d=%d)-(%d+%d=%d,%d+%d=%d) in table size (%d,%d)\n"
msgstr ""
-#: src/ui/gui/customentry.c:337 src/ui/gui/psppire-status-bar.c:252
+#: src/ui/gui/customentry.c:337
msgid "Style of bevel around the custom entry button"
msgstr ""
-#: src/ui/gui/data-editor.c:369 src/ui/gui/data-editor.glade:531
+#: src/ui/gui/data-editor.c:368 src/ui/gui/data-editor.glade:531
msgid "Open"
msgstr ""
-#: src/ui/gui/data-editor.c:377
+#: src/ui/gui/data-editor.c:376
msgid "System Files (*.sav)"
msgstr ""
-#: src/ui/gui/data-editor.c:383
+#: src/ui/gui/data-editor.c:382
msgid "Portable Files (*.por) "
msgstr ""
-#: src/ui/gui/data-editor.c:389 src/ui/gui/syntax-editor.c:140
-#: src/ui/gui/syntax-editor.c:541
+#: src/ui/gui/data-editor.c:388 src/ui/gui/syntax-editor.c:140
+#: src/ui/gui/syntax-editor.c:538
msgid "All Files"
msgstr ""
-#: src/ui/gui/data-editor.c:467
+#: src/ui/gui/data-editor.c:466
msgid "Font Selection"
msgstr ""
@@ -4170,7 +4170,7 @@
msgstr ""
#: src/ui/gui/data-editor.glade:278 src/ui/gui/data-editor.glade:831
-#: src/ui/gui/data-editor.glade:1682 src/ui/gui/data-editor.glade:1959
+#: src/ui/gui/data-editor.glade:1993 src/ui/gui/data-editor.glade:2270
msgid "Value Labels"
msgstr ""
@@ -4191,11 +4191,11 @@
msgstr ""
#: src/ui/gui/data-editor.glade:343 src/ui/gui/data-editor.glade:638
-#: src/ui/gui/data-editor.glade:2524
+#: src/ui/gui/data-editor.glade:2835
msgid "Go To Case"
msgstr ""
-#: src/ui/gui/data-editor.glade:372 src/ui/gui/data-editor.glade:2635
+#: src/ui/gui/data-editor.glade:372 src/ui/gui/data-editor.glade:2946
msgid "Sort Cases"
msgstr ""
@@ -4283,107 +4283,135 @@
msgid "Variable View"
msgstr ""
-#: src/ui/gui/data-editor.glade:1075
+#: src/ui/gui/data-editor.glade:1079
+msgid "Information Area"
+msgstr ""
+
+#: src/ui/gui/data-editor.glade:1126
+msgid "Processor Area"
+msgstr ""
+
+#: src/ui/gui/data-editor.glade:1169
+msgid "OMS Area"
+msgstr ""
+
+#: src/ui/gui/data-editor.glade:1212
+msgid "Case Counter Area"
+msgstr ""
+
+#: src/ui/gui/data-editor.glade:1255
+msgid "Filter Use Status Area"
+msgstr ""
+
+#: src/ui/gui/data-editor.glade:1298
+msgid "Weight Status Area"
+msgstr ""
+
+#: src/ui/gui/data-editor.glade:1341
+msgid "Split File Status Area"
+msgstr ""
+
+#: src/ui/gui/data-editor.glade:1386
msgid "Variable Type"
msgstr ""
-#: src/ui/gui/data-editor.glade:1127 src/ui/gui/psppire-var-store.c:476
+#: src/ui/gui/data-editor.glade:1438 src/ui/gui/psppire-var-store.c:476
msgid "Comma"
msgstr ""
-#: src/ui/gui/data-editor.glade:1147 src/ui/gui/psppire-var-store.c:477
+#: src/ui/gui/data-editor.glade:1458 src/ui/gui/psppire-var-store.c:477
msgid "Dot"
msgstr ""
-#: src/ui/gui/data-editor.glade:1167
+#: src/ui/gui/data-editor.glade:1478
msgid "Scientific notation"
msgstr ""
-#: src/ui/gui/data-editor.glade:1187 src/ui/gui/psppire-var-store.c:479
+#: src/ui/gui/data-editor.glade:1498 src/ui/gui/psppire-var-store.c:479
msgid "Date"
msgstr ""
-#: src/ui/gui/data-editor.glade:1207 src/ui/gui/psppire-var-store.c:480
+#: src/ui/gui/data-editor.glade:1518 src/ui/gui/psppire-var-store.c:480
msgid "Dollar"
msgstr ""
-#: src/ui/gui/data-editor.glade:1227
+#: src/ui/gui/data-editor.glade:1538
msgid "Custom currency"
msgstr ""
-#: src/ui/gui/data-editor.glade:1372
+#: src/ui/gui/data-editor.glade:1683
msgid "positive"
msgstr ""
-#: src/ui/gui/data-editor.glade:1397
+#: src/ui/gui/data-editor.glade:1708
msgid "negative"
msgstr ""
-#: src/ui/gui/data-editor.glade:1426
+#: src/ui/gui/data-editor.glade:1737
msgid "Sample"
msgstr ""
-#: src/ui/gui/data-editor.glade:1504
+#: src/ui/gui/data-editor.glade:1815
msgid "Decimal Places:"
msgstr ""
-#: src/ui/gui/data-editor.glade:1581
+#: src/ui/gui/data-editor.glade:1892
msgid "Width:"
msgstr ""
-#: src/ui/gui/data-editor.glade:1800
+#: src/ui/gui/data-editor.glade:2111
msgid "Value:"
msgstr ""
-#: src/ui/gui/data-editor.glade:1828
+#: src/ui/gui/data-editor.glade:2139
msgid "Value Label:"
msgstr ""
-#: src/ui/gui/data-editor.glade:2044
+#: src/ui/gui/data-editor.glade:2355
msgid "Missing Values"
msgstr ""
-#: src/ui/gui/data-editor.glade:2130
+#: src/ui/gui/data-editor.glade:2441
msgid "_No missing values"
msgstr ""
-#: src/ui/gui/data-editor.glade:2155
+#: src/ui/gui/data-editor.glade:2466
msgid "_Discrete missing values"
msgstr ""
-#: src/ui/gui/data-editor.glade:2284
+#: src/ui/gui/data-editor.glade:2595
msgid "_Range plus one optional discrete missing value"
msgstr ""
-#: src/ui/gui/data-editor.glade:2321
+#: src/ui/gui/data-editor.glade:2632
msgid "_Low:"
msgstr ""
-#: src/ui/gui/data-editor.glade:2380
+#: src/ui/gui/data-editor.glade:2691
msgid "_High:"
msgstr ""
-#: src/ui/gui/data-editor.glade:2454
+#: src/ui/gui/data-editor.glade:2765
msgid "Di_screte value:"
msgstr ""
-#: src/ui/gui/data-editor.glade:2580
+#: src/ui/gui/data-editor.glade:2891
msgid "Case Number:"
msgstr ""
-#: src/ui/gui/data-editor.glade:2752 src/ui/gui/sort-cases-dialog.c:279
+#: src/ui/gui/data-editor.glade:3063 src/ui/gui/sort-cases-dialog.c:279
msgid "Ascending"
msgstr ""
-#: src/ui/gui/data-editor.glade:2771 src/ui/gui/sort-cases-dialog.c:281
+#: src/ui/gui/data-editor.glade:3082 src/ui/gui/sort-cases-dialog.c:281
msgid "Descending"
msgstr ""
-#: src/ui/gui/data-editor.glade:2792
+#: src/ui/gui/data-editor.glade:3103
msgid "Sort Order"
msgstr ""
-#: src/ui/gui/data-editor.glade:2829
+#: src/ui/gui/data-editor.glade:3140
msgid "Sort by:"
msgstr ""
@@ -4431,11 +4459,11 @@
msgid "Incorrect range specification"
msgstr ""
-#: src/ui/gui/psppire-data-store.c:745
+#: src/ui/gui/psppire-data-store.c:743
msgid "var"
msgstr ""
-#: src/ui/gui/psppire-data-store.c:826 src/ui/gui/psppire-var-store.c:552
+#: src/ui/gui/psppire-data-store.c:824 src/ui/gui/psppire-var-store.c:552
#: src/ui/gui/psppire-var-store.c:562 src/ui/gui/psppire-var-store.c:572
#: src/ui/gui/psppire-var-store.c:770
#, c-format
@@ -4493,11 +4521,11 @@
msgid "Save Syntax"
msgstr ""
-#: src/ui/gui/syntax-editor.c:134 src/ui/gui/syntax-editor.c:535
+#: src/ui/gui/syntax-editor.c:134 src/ui/gui/syntax-editor.c:532
msgid "Syntax Files (*.sps) "
msgstr ""
-#: src/ui/gui/syntax-editor.c:527
+#: src/ui/gui/syntax-editor.c:524
msgid "Open Syntax"
msgstr ""
Index: src/data/ChangeLog
===================================================================
RCS file: /sources/pspp/pspp/src/data/ChangeLog,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -b -r1.94 -r1.95
--- src/data/ChangeLog 23 Dec 2006 06:11:33 -0000 1.94
+++ src/data/ChangeLog 1 Jan 2007 01:44:33 -0000 1.95
@@ -1,3 +1,8 @@
+Mon Jan 1 10:36:26 WST 2007 John Darrington <address@hidden>
+
+ * dictionary.c dictionary.h : Added replace_source and replace_dict
+ callbacks, and functions to deal with them.
+
Fri Dec 22 13:56:08 2006 Ben Pfaff <address@hidden>
Simplify missing value handling.
Index: src/data/dictionary.c
===================================================================
RCS file: /sources/pspp/pspp/src/data/dictionary.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- src/data/dictionary.c 28 Dec 2006 04:21:07 -0000 1.26
+++ src/data/dictionary.c 1 Jan 2007 01:44:33 -0000 1.27
@@ -82,6 +82,15 @@
}
+/* Shallow copy the callbacks from SRC to DEST */
+void
+dict_copy_callbacks (struct dictionary *dest,
+ const struct dictionary *src)
+{
+ dest->callbacks = src->callbacks;
+ dest->cb_data = src->cb_data;
+}
+
/* Creates and returns a new dictionary. */
struct dictionary *
dict_create (void)
@@ -166,6 +175,9 @@
for (i = 0; i < d->var_cnt; i++)
{
+ if (d->callbacks && d->callbacks->var_deleted )
+ d->callbacks->var_deleted (d, i, d->cb_data);
+
var_clear_vardict (d->var[i]);
var_destroy (d->var[i]);
}
Index: src/data/dictionary.h
===================================================================
RCS file: /sources/pspp/pspp/src/data/dictionary.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- src/data/dictionary.h 16 Dec 2006 03:40:41 -0000 1.8
+++ src/data/dictionary.h 1 Jan 2007 01:44:33 -0000 1.9
@@ -39,6 +39,8 @@
struct dictionary *dict_clone (const struct dictionary *);
void dict_set_callbacks (struct dictionary *, const struct dict_callbacks *,
void *);
+void dict_copy_callbacks (struct dictionary *, const struct dictionary *);
+
void dict_clear (struct dictionary *);
void dict_clear_aux (struct dictionary *);
Index: src/data/procedure.c
===================================================================
RCS file: /sources/pspp/pspp/src/data/procedure.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- src/data/procedure.c 23 Dec 2006 06:11:33 -0000 1.21
+++ src/data/procedure.c 1 Jan 2007 01:44:33 -0000 1.22
@@ -43,6 +43,13 @@
/* An abstract factory which creates casefiles */
struct casefile_factory *cf_factory;
+ /* Callback which occurs when a procedure provides a new source for
+ the dataset */
+ replace_source_callback *replace_source ;
+
+ /* Callback which occurs whenever the DICT is replaced by a new one */
+ replace_dictionary_callback *replace_dict;
+
/* Cases are read from proc_source,
pass through permanent_trns_chain (which transforms them into
the format described by permanent_dict),
@@ -201,6 +208,7 @@
return ok;
}
+
/* Procedure implementation. */
/* Executes a procedure.
@@ -222,7 +230,16 @@
ok = proc (c, aux, ds) && ok;
if (end != NULL)
ok = end (aux, ds) && ok;
- return proc_close (ds) && ok;
+
+ if ( proc_close (ds) && ok )
+ {
+ if ( ds->replace_source )
+ ds->replace_source (ds->proc_source);
+
+ return true;
+ }
+
+ return false;
}
/* Opens dataset DS for reading cases with proc_read.
@@ -711,6 +728,9 @@
free_case_source (ds->proc_source);
ds->proc_source = NULL;
+ if ( ds->replace_source )
+ ds->replace_source (ds->proc_source);
+
proc_cancel_all_transformations (ds);
}
@@ -844,11 +864,16 @@
/* Initializes procedure handling. */
struct dataset *
-create_dataset (struct casefile_factory *fact)
+create_dataset (struct casefile_factory *fact,
+ replace_source_callback *rps,
+ replace_dictionary_callback *rds
+ )
{
struct dataset *ds = xzalloc (sizeof(*ds));
ds->dict = dict_create ();
ds->cf_factory = fact;
+ ds->replace_source = rps;
+ ds->replace_dict = rds;
proc_cancel_all_transformations (ds);
return ds;
}
@@ -993,7 +1018,11 @@
void
dataset_set_dict (struct dataset *ds, struct dictionary *dict)
{
+ dict_copy_callbacks (dict, ds->dict);
ds->dict = dict;
+
+ if ( ds->replace_dict )
+ ds->replace_dict (dict);
}
int
Index: src/data/procedure.h
===================================================================
RCS file: /sources/pspp/pspp/src/data/procedure.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- src/data/procedure.h 22 Dec 2006 11:12:14 -0000 1.10
+++ src/data/procedure.h 1 Jan 2007 01:44:33 -0000 1.11
@@ -58,7 +58,16 @@
/* Procedures. */
-struct dataset * create_dataset (struct casefile_factory *);
+struct dictionary ;
+typedef void replace_source_callback (struct case_source *);
+typedef void replace_dictionary_callback (struct dictionary *);
+
+
+struct dataset * create_dataset (struct casefile_factory *fact,
+ replace_source_callback *,
+ replace_dictionary_callback *
+ );
+
void destroy_dataset (struct dataset *);
struct casefile_factory *dataset_get_casefile_factory (const struct dataset *);
Index: src/language/expressions/evaluate.c
===================================================================
RCS file: /sources/pspp/pspp/src/language/expressions/evaluate.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- src/language/expressions/evaluate.c 22 Dec 2006 11:12:14 -0000 1.16
+++ src/language/expressions/evaluate.c 1 Jan 2007 01:44:33 -0000 1.17
@@ -158,7 +158,7 @@
if ( ds == NULL )
{
- ds = create_dataset (NULL);
+ ds = create_dataset (NULL, NULL, NULL);
d = dataset_dict (ds);
}
Index: src/ui/gui/ChangeLog
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/ChangeLog,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- src/ui/gui/ChangeLog 26 Dec 2006 21:32:09 -0000 1.33
+++ src/ui/gui/ChangeLog 1 Jan 2007 01:44:33 -0000 1.34
@@ -1,3 +1,19 @@
+Mon Jan 1 10:37:07 WST 2007 John Darrington <address@hidden>
+
+ * psppire-case-file.c psppire-case-file.h: Changed the backend
+ semantics. An object is now created without any backend. A new
function ( psppire_case_file_replace_flexifile ) sets the backend to use.
+
+ * psppire-data-store.c : Updated callers accordingly.
+
+ * psppire-dict.c psppire-dict.h : New function
+ (psppire_dict_replace_dictionary) .
+
+ * psppire.c : Updated to use new dataset replace_{source, dictionary}
+ callbacks.
+
+ * syntax-editor.c : parses in state CMD_STATE_DATA unless there are
+ no variables in the dictionary.
+
Mon Dec 25 12:38:24 WST 2006 John Darrington <address@hidden>
* data-editor.c data-editor.glade: Enabled deleting of variables from
Index: src/ui/gui/psppire-case-file.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/psppire-case-file.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- src/ui/gui/psppire-case-file.c 24 Dec 2006 23:08:25 -0000 1.13
+++ src/ui/gui/psppire-case-file.c 1 Jan 2007 01:44:33 -0000 1.14
@@ -153,33 +153,22 @@
* Creates a new #PsppireCaseFile.
*/
PsppireCaseFile*
-psppire_case_file_new (gint val_cnt)
+psppire_case_file_new (void)
{
PsppireCaseFile *cf = g_object_new (G_TYPE_PSPPIRE_CASE_FILE, NULL);
- cf->flexifile = flexifile_create (val_cnt);
-
return cf;
}
-/**
- * psppire_case_file_new_from_flexifile:
- * @returns: a new #PsppireCaseFile object
- *
- * Creates a new #PsppireCaseFile from an existing flexifile
- */
-PsppireCaseFile*
-psppire_case_file_new_from_flexifile (struct flexifile *ff)
+void
+psppire_case_file_replace_flexifile (PsppireCaseFile *cf, struct flexifile *ff)
{
- PsppireCaseFile *cf = g_object_new (G_TYPE_PSPPIRE_CASE_FILE, NULL);
-
cf->flexifile = (struct casefile *) ff;
-
- return cf;
}
+
gboolean
psppire_case_file_delete_cases (PsppireCaseFile *cf, gint n_cases, gint first)
{
Index: src/ui/gui/psppire-case-file.h
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/psppire-case-file.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- src/ui/gui/psppire-case-file.h 24 Dec 2006 22:49:18 -0000 1.10
+++ src/ui/gui/psppire-case-file.h 1 Jan 2007 01:44:33 -0000 1.11
@@ -68,9 +68,7 @@
/* -- PsppireCaseFile --- */
GType psppire_case_file_get_type (void);
-PsppireCaseFile *psppire_case_file_new (gint var_cnt);
-PsppireCaseFile* psppire_case_file_new_from_flexifile (struct flexifile *ff);
-
+PsppireCaseFile *psppire_case_file_new (void);
gboolean psppire_case_file_insert_case (PsppireCaseFile *cf, struct ccase *c,
gint row);
@@ -103,6 +101,10 @@
gboolean psppire_case_file_get_case (const PsppireCaseFile *cf, gint casenum,
struct ccase *c);
+void psppire_case_file_replace_flexifile (PsppireCaseFile *,
+ struct flexifile *);
+
+
G_END_DECLS
Index: src/ui/gui/psppire-data-store.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/psppire-data-store.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- src/ui/gui/psppire-data-store.c 28 Dec 2006 04:21:08 -0000 1.30
+++ src/ui/gui/psppire-data-store.c 1 Jan 2007 01:44:33 -0000 1.31
@@ -384,8 +384,6 @@
void
psppire_data_store_set_dictionary (PsppireDataStore *data_store, PsppireDict
*dict)
{
- gint var_cnt = psppire_dict_get_next_value_idx (dict);
-
data_store->dict = dict;
if ( data_store->case_file)
@@ -394,7 +392,7 @@
data_store->case_file = 0;
}
- data_store->case_file = psppire_case_file_new (var_cnt);
+ data_store->case_file = psppire_case_file_new ();
g_signal_connect (data_store->case_file, "cases-deleted",
G_CALLBACK (delete_cases_callback),
@@ -845,3 +843,4 @@
iface->get_button_label = geometry_get_row_button_label;
}
+
Index: src/ui/gui/psppire-dict.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/psppire-dict.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- src/ui/gui/psppire-dict.c 28 Dec 2006 04:21:08 -0000 1.19
+++ src/ui/gui/psppire-dict.c 1 Jan 2007 01:44:33 -0000 1.20
@@ -221,6 +221,13 @@
}
+void
+psppire_dict_replace_dictionary (PsppireDict *dict, struct dictionary *d)
+{
+ dict->dict = d;
+}
+
+
/* Returns a valid name for a new variable in DICT.
The return value is statically allocated */
static gchar *
@@ -339,7 +346,6 @@
return dict_lookup_var (d->dict, name);
}
-
/* Clears the contents of D */
void
psppire_dict_clear (PsppireDict *d)
@@ -348,14 +354,11 @@
g_return_if_fail (d->dict);
{
- const gint n_vars = dict_get_var_cnt (d->dict);
-
dict_clear (d->dict);
}
}
-
/* Return true is NAME would be a valid name of a variable to add to the
dictionary. False otherwise.
If REPORT is true, then invalid names will be reported as such as errors
Index: src/ui/gui/psppire-dict.h
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/psppire-dict.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- src/ui/gui/psppire-dict.h 25 Dec 2006 02:29:11 -0000 1.12
+++ src/ui/gui/psppire-dict.h 1 Jan 2007 01:44:33 -0000 1.13
@@ -102,6 +102,8 @@
void psppire_dict_rename_var (PsppireDict *dict, struct variable *v,
const gchar *text);
+void psppire_dict_replace_dictionary (PsppireDict *, struct dictionary *);
+
G_END_DECLS
Index: src/ui/gui/psppire.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/psppire.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- src/ui/gui/psppire.c 27 Dec 2006 09:04:35 -0000 1.32
+++ src/ui/gui/psppire.c 1 Jan 2007 01:44:33 -0000 1.33
@@ -28,11 +28,13 @@
#include <libpspp/copyleft.h>
#include <data/file-handle-def.h>
#include <data/format.h>
+#include <data/storage-stream.h>
#include <data/settings.h>
#include <data/file-name.h>
#include <data/procedure.h>
#include <libpspp/getl.h>
#include <language/lexer/lexer.h>
+#include <ui/flexifile.h>
#include <getopt.h>
#include <gtk/gtk.h>
@@ -61,6 +63,26 @@
struct source_stream *the_source_stream ;
struct dataset * the_dataset = NULL;
+static void
+replace_dictionary (struct dictionary *d)
+{
+ psppire_dict_replace_dictionary (the_data_store->dict,
+ d);
+}
+
+
+static void
+replace_flexifile (struct case_source *s)
+{
+ if ( NULL == s )
+ psppire_case_file_replace_flexifile (the_data_store->case_file,
+ (struct flexifile *) flexifile_create
(0));
+ else
+ psppire_case_file_replace_flexifile (the_data_store->case_file,
+ (struct flexifile *)
+ storage_source_get_casefile (s));
+}
+
int
main (int argc, char *argv[])
@@ -106,12 +128,13 @@
fn_getenv_default ("STAT_INCLUDE_PATH", include_path)
);
- the_dataset = create_dataset (factory);
+ the_dataset = create_dataset (factory,
+ replace_flexifile,
+ replace_dictionary);
message_dialog_init (the_source_stream);
- dictionary =
- psppire_dict_new_from_dict (
+ dictionary = psppire_dict_new_from_dict (
dataset_dict (the_dataset)
);
@@ -123,6 +146,10 @@
the_data_store = psppire_data_store_new (dictionary);
+ proc_set_source (the_dataset,
+ storage_source_create (the_data_store->case_file->flexifile)
+ );
+
create_icon_factory ();
new_data_window (NULL, NULL);
Index: src/ui/gui/syntax-editor.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/syntax-editor.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- src/ui/gui/syntax-editor.c 28 Dec 2006 00:44:45 -0000 1.11
+++ src/ui/gui/syntax-editor.c 1 Jan 2007 01:44:33 -0000 1.12
@@ -33,6 +33,7 @@
#include "window-manager.h"
+#include <data/dictionary.h>
#include <language/lexer/lexer.h>
#include <language/command.h>
#include <data/procedure.h>
@@ -214,14 +215,16 @@
execute_syntax (const struct syntax_editor *se, GtkTextIter start,
GtkTextIter stop)
{
+ g_return_if_fail (proc_has_source (the_dataset));
+
getl_append_source (the_source_stream,
create_syntax_editor_source (se, start, stop));
for (;;)
{
+ const struct dictionary *dict = dataset_dict (the_dataset);
int result = cmd_parse (se->lexer, the_dataset,
- proc_has_source (the_dataset)
- ? CMD_STATE_DATA : CMD_STATE_INITIAL);
-
+ dict_get_var_cnt (dict) > 0 ?
+ CMD_STATE_DATA : CMD_STATE_INITIAL);
if (result == CMD_EOF || result == CMD_FINISH)
break;
}
Index: src/ui/terminal/main.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/terminal/main.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- src/ui/terminal/main.c 22 Dec 2006 11:12:15 -0000 1.28
+++ src/ui/terminal/main.c 1 Jan 2007 01:44:33 -0000 1.29
@@ -108,7 +108,7 @@
factory = fastfile_factory_create ();
- the_dataset = create_dataset (factory);
+ the_dataset = create_dataset (factory, NULL, NULL);
if (parse_command_line (argc, argv, the_source_stream))
{