GitList
Browse code

save

Christian Fraß authored on 25/07/2017 09:03:16
Showing 3 changed files
source/content/adpositions.html.php
History View file @ 93d9ca5
... ... 
@@ -11,11 +11,21 @@
11 11 
 	  -->
12 12 
 <?php
13 13 
 	$data_adpositions = read_json("source/data/adpositions.json");
14 
-	$data = $data_adpositions["words"];
14 
+	// $data = $data_adpositions["words"];
15 
+	$data = $data_adpositions["situations"];
15 16 
 	{
17 
+		/*
16 18 
 		{
17 19 
 			$data = sql_cross($data, $data_adpositions["situations"]);
18 20 
 			$data = sql_select($data, function ($row) {return ($row["situation_id"] == $row["id"]);});
21 
+			$data = sql_order($data, function ($x, $y) {return ($x["situation_id"] >= $y["situation_id"]);});
22 
+			$data = sql_delete($data, ["situation_id", "id"]);
23 
+			$data = sql_rename($data, "name", "situation_name");
24 
+		}
25 
+		 */
26 
+		{
27 
+			$data = sql_cross($data, $data_adpositions["words"]);
28 
+			$data = sql_select($data, function ($row) {return ($row["situation_id"] == $row["id"]);});
19 29 
 			$data = sql_delete($data, ["situation_id", "id"]);
20 30 
 			$data = sql_rename($data, "name", "situation_name");
21 31 
 		}
source/data/adpositions.json
History View file @ 93d9ca5
... ... 
@@ -2,27 +2,29 @@
2 2 
 	"situations": [
3 3 
 		{"id": "x00", "name": "fore"},
4 4 
 		{"id": "x01", "name": "back"},
5 
-		{"id": "x02", "name": "up"},
6 5 
 		{"id": "x03", "name": "down"},
7 
-		{"id": "x06", "name": "in"},
8 
-		{"id": "x07", "name": "out"},
9 
-		{"id": "x08", "name": "on"},
10 
-		{"id": "x04", "name": "left"},
11 
-		{"id": "x05", "name": "right"},
6 
+		{"id": "x02", "name": "up"},
7 
+		{"id": "x06", "name": "on"},
8 
+		{"id": "x04", "name": "in"},
9 
+		{"id": "x05", "name": "out"},
10 
+		{"id": "x07", "name": "left"},
11 
+		{"id": "x08", "name": "right"},
12 
+		{"id": "x24", "name": "next to"},
12 13 
 		{"id": "x09", "name": "between"},
13 14 
 		{"id": "x10", "name": "for"},
14 15 
 		{"id": "x11", "name": "against"},
15 16 
 		{"id": "x12", "name": "from"},
16 17 
 		{"id": "x13", "name": "to"},
17 18 
 		{"id": "x14", "name": "til"},
19 
+		{"id": "x18", "name": "through"},
18 20 
 		{"id": "x15", "name": "with"},
19 21 
 		{"id": "x16", "name": "without"},
20 22 
 		{"id": "x17", "name": "by"},
21 
-		{"id": "x18", "name": "through"},
22 23 
 		{"id": "x19", "name": "along"},
23 24 
 		{"id": "x20", "name": "despite"},
24 25 
 		{"id": "x21", "name": "according to"},
25 
-		{"id": "x22", "name": "away"}
26 
+		{"id": "x22", "name": "away"},
27 
+		{"id": "x23", "name": "of"}
26 28 
 	],
27 29 
 	"types": [
28 30 
 		{"id": "dir", "name": "Directive"},
... ... 
@@ -54,31 +56,36 @@
54 56 
 		{"language_id": "flk", "situation_id": "x03", "type_id": "pos", "reference_id": "att", "words": ["neder"]},
55 57 
 		{"language_id": "flk", "situation_id": "x03", "type_id": "dir", "reference_id": "abs", "words": ["ned"]},
56 58 
 		{"language_id": "flk", "situation_id": "x03", "type_id": "dir", "reference_id": "rel", "words": ["ned (av)"]},
57 
-		{"language_id": "flk", "situation_id": "x04", "type_id": "pos", "reference_id": "abs", "words": ["vinstan"]},
58 
-		{"language_id": "flk", "situation_id": "x04", "type_id": "pos", "reference_id": "rel", "words": ["vinstan (av)"]},
59 
-		{"language_id": "flk", "situation_id": "x04", "type_id": "pos", "reference_id": "att", "words": ["vinster"]},
60 
-		{"language_id": "flk", "situation_id": "x04", "type_id": "dir", "reference_id": "abs", "words": ["vinst"]},
61 
-		{"language_id": "flk", "situation_id": "x04", "type_id": "dir", "reference_id": "rel", "words": ["vinst (av)"]},
62 
-		{"language_id": "flk", "situation_id": "x05", "type_id": "pos", "reference_id": "abs", "words": ["hegan"]},
63 
-		{"language_id": "flk", "situation_id": "x05", "type_id": "pos", "reference_id": "rel", "words": ["hegan (av)"]},
64 
-		{"language_id": "flk", "situation_id": "x05", "type_id": "pos", "reference_id": "att", "words": ["heger"]},
65 
-		{"language_id": "flk", "situation_id": "x05", "type_id": "dir", "reference_id": "abs", "words": ["heg"]},
66 
-		{"language_id": "flk", "situation_id": "x05", "type_id": "dir", "reference_id": "rel", "words": ["heg (av)"]},
67 
-		{"language_id": "flk", "situation_id": "x06", "type_id": "pos", "reference_id": "abs", "words": ["inan"]},
68 
-		{"language_id": "flk", "situation_id": "x06", "type_id": "pos", "reference_id": "rel", "words": ["inan (av)"]},
69 
-		{"language_id": "flk", "situation_id": "x06", "type_id": "pos", "reference_id": "att", "words": ["iner"]},
70 
-		{"language_id": "flk", "situation_id": "x06", "type_id": "dir", "reference_id": "abs", "words": ["in"]},
71 
-		{"language_id": "flk", "situation_id": "x06", "type_id": "dir", "reference_id": "rel", "words": ["in (av)"]},
72 
-		{"language_id": "flk", "situation_id": "x07", "type_id": "pos", "reference_id": "abs", "words": ["utan"]},
73 
-		{"language_id": "flk", "situation_id": "x07", "type_id": "pos", "reference_id": "rel", "words": ["utan (av)"]},
74 
-		{"language_id": "flk", "situation_id": "x07", "type_id": "pos", "reference_id": "att", "words": ["uter"]},
75 
-		{"language_id": "flk", "situation_id": "x07", "type_id": "dir", "reference_id": "abs", "words": ["ut"]},
76 
-		{"language_id": "flk", "situation_id": "x07", "type_id": "dir", "reference_id": "rel", "words": ["ut (av)"]},
77 
-		{"language_id": "flk", "situation_id": "x08", "type_id": "pos", "reference_id": "abs", "words": ["upan"]},
78 
-		{"language_id": "flk", "situation_id": "x08", "type_id": "pos", "reference_id": "rel", "words": ["upan (av)"]},
79 
-		{"language_id": "flk", "situation_id": "x08", "type_id": "pos", "reference_id": "att", "words": ["uper"]},
80 
-		{"language_id": "flk", "situation_id": "x08", "type_id": "dir", "reference_id": "abs", "words": ["up"]},
81 
-		{"language_id": "flk", "situation_id": "x08", "type_id": "dir", "reference_id": "rel", "words": ["up (av)"]},
59 
+		{"language_id": "flk", "situation_id": "x04", "type_id": "pos", "reference_id": "abs", "words": ["inan"]},
60 
+		{"language_id": "flk", "situation_id": "x04", "type_id": "pos", "reference_id": "rel", "words": ["inan (av)"]},
61 
+		{"language_id": "flk", "situation_id": "x04", "type_id": "pos", "reference_id": "att", "words": ["iner"]},
62 
+		{"language_id": "flk", "situation_id": "x04", "type_id": "dir", "reference_id": "abs", "words": ["in"]},
63 
+		{"language_id": "flk", "situation_id": "x04", "type_id": "dir", "reference_id": "rel", "words": ["in (av)"]},
64 
+		{"language_id": "flk", "situation_id": "x05", "type_id": "pos", "reference_id": "abs", "words": ["utan"]},
65 
+		{"language_id": "flk", "situation_id": "x05", "type_id": "pos", "reference_id": "rel", "words": ["utan (av)"]},
66 
+		{"language_id": "flk", "situation_id": "x05", "type_id": "pos", "reference_id": "att", "words": ["uter"]},
67 
+		{"language_id": "flk", "situation_id": "x05", "type_id": "dir", "reference_id": "abs", "words": ["ut"]},
68 
+		{"language_id": "flk", "situation_id": "x05", "type_id": "dir", "reference_id": "rel", "words": ["ut (av)"]},
69 
+		{"language_id": "flk", "situation_id": "x06", "type_id": "pos", "reference_id": "abs", "words": ["upan"]},
70 
+		{"language_id": "flk", "situation_id": "x06", "type_id": "pos", "reference_id": "rel", "words": ["upan (av)"]},
71 
+		{"language_id": "flk", "situation_id": "x06", "type_id": "pos", "reference_id": "att", "words": ["uper"]},
72 
+		{"language_id": "flk", "situation_id": "x06", "type_id": "dir", "reference_id": "abs", "words": ["up"]},
73 
+		{"language_id": "flk", "situation_id": "x06", "type_id": "dir", "reference_id": "rel", "words": ["up (av)"]},
74 
+		{"language_id": "flk", "situation_id": "x07", "type_id": "pos", "reference_id": "abs", "words": ["vinstan"]},
75 
+		{"language_id": "flk", "situation_id": "x07", "type_id": "pos", "reference_id": "rel", "words": ["vinstan (av)"]},
76 
+		{"language_id": "flk", "situation_id": "x07", "type_id": "pos", "reference_id": "att", "words": ["vinster"]},
77 
+		{"language_id": "flk", "situation_id": "x07", "type_id": "dir", "reference_id": "abs", "words": ["vinst"]},
78 
+		{"language_id": "flk", "situation_id": "x07", "type_id": "dir", "reference_id": "rel", "words": ["vinst (av)"]},
79 
+		{"language_id": "flk", "situation_id": "x08", "type_id": "pos", "reference_id": "abs", "words": ["hegan"]},
80 
+		{"language_id": "flk", "situation_id": "x08", "type_id": "pos", "reference_id": "rel", "words": ["hegan (av)"]},
81 
+		{"language_id": "flk", "situation_id": "x08", "type_id": "pos", "reference_id": "att", "words": ["heger"]},
82 
+		{"language_id": "flk", "situation_id": "x08", "type_id": "dir", "reference_id": "abs", "words": ["heg"]},
83 
+		{"language_id": "flk", "situation_id": "x08", "type_id": "dir", "reference_id": "rel", "words": ["heg (av)"]},
84 
+		{"language_id": "flk", "situation_id": "x24", "type_id": "pos", "reference_id": "abs", "words": ["vedan"]},
85 
+		{"language_id": "flk", "situation_id": "x24", "type_id": "pos", "reference_id": "rel", "words": ["vedan (av)"]},
86 
+		{"language_id": "flk", "situation_id": "x24", "type_id": "pos", "reference_id": "att", "words": ["veder"]},
87 
+		{"language_id": "flk", "situation_id": "x24", "type_id": "dir", "reference_id": "abs", "words": ["ved"]},
88 
+		{"language_id": "flk", "situation_id": "x24", "type_id": "dir", "reference_id": "rel", "words": ["ved (av)"]},
82 89 
 		{"language_id": "flk", "situation_id": "x09", "type_id": "pos", "reference_id": "abs", "words": ["melan"]},
83 90 
 		{"language_id": "flk", "situation_id": "x09", "type_id": "pos", "reference_id": "rel", "words": ["melan (av)"]},
84 91 
 		{"language_id": "flk", "situation_id": "x09", "type_id": "pos", "reference_id": "att", "words": ["meler"]},
... ... 
@@ -149,6 +156,12 @@
149 156 
 		{"language_id": "flk", "situation_id": "x22", "type_id": "pos", "reference_id": "att", "words": []},
150 157 
 		{"language_id": "flk", "situation_id": "x22", "type_id": "dir", "reference_id": "abs", "words": []},
151 158 
 		{"language_id": "flk", "situation_id": "x22", "type_id": "dir", "reference_id": "rel", "words": []},
159 
+		{"language_id": "flk", "situation_id": "x23", "type_id": "pos", "reference_id": "abs", "words": ["av"]},
160 
+		{"language_id": "flk", "situation_id": "x23", "type_id": "pos", "reference_id": "rel", "words": []},
161 
+		{"language_id": "flk", "situation_id": "x23", "type_id": "pos", "reference_id": "att", "words": []},
162 
+		{"language_id": "flk", "situation_id": "x23", "type_id": "dir", "reference_id": "abs", "words": []},
163 
+		{"language_id": "flk", "situation_id": "x23", "type_id": "dir", "reference_id": "rel", "words": []},
164 
+
152 165 
 		{"language_id": "eng", "situation_id": "x00", "type_id": "pos", "reference_id": "abs", "words": ["in front"]},
153 166 
 		{"language_id": "eng", "situation_id": "x00", "type_id": "pos", "reference_id": "rel", "words": ["in front of"]},
154 167 
 		{"language_id": "eng", "situation_id": "x00", "type_id": "pos", "reference_id": "att", "words": ["fore", "front"]},
... ... 
@@ -169,31 +182,31 @@
169 182 
 		{"language_id": "eng", "situation_id": "x03", "type_id": "pos", "reference_id": "att", "words": ["lower"]},
170 183 
 		{"language_id": "eng", "situation_id": "x03", "type_id": "dir", "reference_id": "abs", "words": ["down"]},
171 184 
 		{"language_id": "eng", "situation_id": "x03", "type_id": "dir", "reference_id": "rel", "words": ["under"]},
172 
-		{"language_id": "eng", "situation_id": "x04", "type_id": "pos", "reference_id": "abs", "words": ["left"]},
173 
-		{"language_id": "eng", "situation_id": "x04", "type_id": "pos", "reference_id": "rel", "words": ["left from"]},
174 
-		{"language_id": "eng", "situation_id": "x04", "type_id": "pos", "reference_id": "att", "words": ["left"]},
175 
-		{"language_id": "eng", "situation_id": "x04", "type_id": "dir", "reference_id": "abs", "words": ["to the left"]},
176 
-		{"language_id": "eng", "situation_id": "x04", "type_id": "dir", "reference_id": "rel", "words": ["to the left of"]},
177 
-		{"language_id": "eng", "situation_id": "x05", "type_id": "pos", "reference_id": "abs", "words": ["right"]},
178 
-		{"language_id": "eng", "situation_id": "x05", "type_id": "pos", "reference_id": "rel", "words": ["right from"]},
179 
-		{"language_id": "eng", "situation_id": "x05", "type_id": "pos", "reference_id": "att", "words": ["right"]},
180 
-		{"language_id": "eng", "situation_id": "x05", "type_id": "dir", "reference_id": "abs", "words": ["to the right"]},
181 
-		{"language_id": "eng", "situation_id": "x05", "type_id": "dir", "reference_id": "rel", "words": ["to the right of"]},
182 
-		{"language_id": "eng", "situation_id": "x06", "type_id": "pos", "reference_id": "abs", "words": ["inside"]},
183 
-		{"language_id": "eng", "situation_id": "x06", "type_id": "pos", "reference_id": "rel", "words": ["in", "inside from"]},
184 
-		{"language_id": "eng", "situation_id": "x06", "type_id": "pos", "reference_id": "att", "words": ["inner"]},
185 
-		{"language_id": "eng", "situation_id": "x06", "type_id": "dir", "reference_id": "abs", "words": ["in"]},
186 
-		{"language_id": "eng", "situation_id": "x06", "type_id": "dir", "reference_id": "rel", "words": ["into"]},
187 
-		{"language_id": "eng", "situation_id": "x07", "type_id": "pos", "reference_id": "abs", "words": ["outside"]},
188 
-		{"language_id": "eng", "situation_id": "x07", "type_id": "pos", "reference_id": "rel", "words": ["out", "outside from"]},
189 
-		{"language_id": "eng", "situation_id": "x07", "type_id": "pos", "reference_id": "att", "words": ["outer"]},
190 
-		{"language_id": "eng", "situation_id": "x07", "type_id": "dir", "reference_id": "abs", "words": ["out"]},
191 
-		{"language_id": "eng", "situation_id": "x07", "type_id": "dir", "reference_id": "rel", "words": ["out of"]},
192 
-		{"language_id": "eng", "situation_id": "x08", "type_id": "pos", "reference_id": "abs", "words": ["upon"]},
193 
-		{"language_id": "eng", "situation_id": "x08", "type_id": "pos", "reference_id": "rel", "words": ["thereon"]},
194 
-		{"language_id": "eng", "situation_id": "x08", "type_id": "pos", "reference_id": "att", "words": []},
195 
-		{"language_id": "eng", "situation_id": "x08", "type_id": "dir", "reference_id": "abs", "words": ["on"]},
196 
-		{"language_id": "eng", "situation_id": "x08", "type_id": "dir", "reference_id": "rel", "words": ["onto"]},
185 
+		{"language_id": "eng", "situation_id": "x07", "type_id": "pos", "reference_id": "abs", "words": ["left"]},
186 
+		{"language_id": "eng", "situation_id": "x07", "type_id": "pos", "reference_id": "rel", "words": ["left from"]},
187 
+		{"language_id": "eng", "situation_id": "x07", "type_id": "pos", "reference_id": "att", "words": ["left"]},
188 
+		{"language_id": "eng", "situation_id": "x07", "type_id": "dir", "reference_id": "abs", "words": ["to the left"]},
189 
+		{"language_id": "eng", "situation_id": "x07", "type_id": "dir", "reference_id": "rel", "words": ["to the left of"]},
190 
+		{"language_id": "eng", "situation_id": "x08", "type_id": "pos", "reference_id": "abs", "words": ["right"]},
191 
+		{"language_id": "eng", "situation_id": "x08", "type_id": "pos", "reference_id": "rel", "words": ["right from"]},
192 
+		{"language_id": "eng", "situation_id": "x08", "type_id": "pos", "reference_id": "att", "words": ["right"]},
193 
+		{"language_id": "eng", "situation_id": "x08", "type_id": "dir", "reference_id": "abs", "words": ["to the right"]},
194 
+		{"language_id": "eng", "situation_id": "x08", "type_id": "dir", "reference_id": "rel", "words": ["to the right of"]},
195 
+		{"language_id": "eng", "situation_id": "x04", "type_id": "pos", "reference_id": "abs", "words": ["inside"]},
196 
+		{"language_id": "eng", "situation_id": "x04", "type_id": "pos", "reference_id": "rel", "words": ["in", "inside from"]},
197 
+		{"language_id": "eng", "situation_id": "x04", "type_id": "pos", "reference_id": "att", "words": ["inner"]},
198 
+		{"language_id": "eng", "situation_id": "x04", "type_id": "dir", "reference_id": "abs", "words": ["in"]},
199 
+		{"language_id": "eng", "situation_id": "x04", "type_id": "dir", "reference_id": "rel", "words": ["into"]},
200 
+		{"language_id": "eng", "situation_id": "x05", "type_id": "pos", "reference_id": "abs", "words": ["outside"]},
201 
+		{"language_id": "eng", "situation_id": "x05", "type_id": "pos", "reference_id": "rel", "words": ["out", "outside from"]},
202 
+		{"language_id": "eng", "situation_id": "x05", "type_id": "pos", "reference_id": "att", "words": ["outer"]},
203 
+		{"language_id": "eng", "situation_id": "x05", "type_id": "dir", "reference_id": "abs", "words": ["out"]},
204 
+		{"language_id": "eng", "situation_id": "x05", "type_id": "dir", "reference_id": "rel", "words": ["out of"]},
205 
+		{"language_id": "eng", "situation_id": "x06", "type_id": "pos", "reference_id": "abs", "words": ["upon"]},
206 
+		{"language_id": "eng", "situation_id": "x06", "type_id": "pos", "reference_id": "rel", "words": ["thereon"]},
207 
+		{"language_id": "eng", "situation_id": "x06", "type_id": "pos", "reference_id": "att", "words": []},
208 
+		{"language_id": "eng", "situation_id": "x06", "type_id": "dir", "reference_id": "abs", "words": ["on"]},
209 
+		{"language_id": "eng", "situation_id": "x06", "type_id": "dir", "reference_id": "rel", "words": ["onto"]},
197 210 
 		{"language_id": "eng", "situation_id": "x09", "type_id": "pos", "reference_id": "abs", "words": ["inbetween"]},
198 211 
 		{"language_id": "eng", "situation_id": "x09", "type_id": "pos", "reference_id": "rel", "words": ["between"]},
199 212 
 		{"language_id": "eng", "situation_id": "x09", "type_id": "pos", "reference_id": "att", "words": ["middle"]},
... ... 
@@ -264,6 +277,7 @@
264 277 
 		{"language_id": "eng", "situation_id": "x22", "type_id": "pos", "reference_id": "att", "words": []},
265 278 
 		{"language_id": "eng", "situation_id": "x22", "type_id": "dir", "reference_id": "abs", "words": []},
266 279 
 		{"language_id": "eng", "situation_id": "x22", "type_id": "dir", "reference_id": "rel", "words": []},
280 
+
267 281 
 		{"language_id": "deu", "situation_id": "x00", "type_id": "pos", "reference_id": "abs", "words": ["vorn(e)"]},
268 282 
 		{"language_id": "deu", "situation_id": "x00", "type_id": "pos", "reference_id": "rel", "words": ["vor (+dat.)"]},
269 283 
 		{"language_id": "deu", "situation_id": "x00", "type_id": "pos", "reference_id": "att", "words": ["vorder-er/e/es"]},
... ... 
@@ -284,31 +298,31 @@
284 298 
 		{"language_id": "deu", "situation_id": "x03", "type_id": "pos", "reference_id": "att", "words": ["unter-er/e/es"]},
285 299 
 		{"language_id": "deu", "situation_id": "x03", "type_id": "dir", "reference_id": "abs", "words": ["(dar-/hin-/her-)unter","nach unten"]},
286 300 
 		{"language_id": "deu", "situation_id": "x03", "type_id": "dir", "reference_id": "rel", "words": ["unter (+acc.)"]},
287 
-		{"language_id": "deu", "situation_id": "x04", "type_id": "pos", "reference_id": "abs", "words": ["links"]},
288 
-		{"language_id": "deu", "situation_id": "x04", "type_id": "pos", "reference_id": "rel", "words": ["links von (+dat.)"]},
289 
-		{"language_id": "deu", "situation_id": "x04", "type_id": "pos", "reference_id": "att", "words": ["link-er/e/es"]},
290 
-		{"language_id": "deu", "situation_id": "x04", "type_id": "dir", "reference_id": "abs", "words": ["nach links"]},
291 
-		{"language_id": "deu", "situation_id": "x04", "type_id": "dir", "reference_id": "rel", "words": []},
292 
-		{"language_id": "deu", "situation_id": "x05", "type_id": "pos", "reference_id": "abs", "words": ["rechts"]},
293 
-		{"language_id": "deu", "situation_id": "x05", "type_id": "pos", "reference_id": "rel", "words": ["rechts von (+dat.)"]},
294 
-		{"language_id": "deu", "situation_id": "x05", "type_id": "pos", "reference_id": "att", "words": ["recht-er/e/es"]},
295 
-		{"language_id": "deu", "situation_id": "x05", "type_id": "dir", "reference_id": "abs", "words": ["nach rechts"]},
296 
-		{"language_id": "deu", "situation_id": "x05", "type_id": "dir", "reference_id": "rel", "words": []},
297 
-		{"language_id": "deu", "situation_id": "x06", "type_id": "pos", "reference_id": "abs", "words": ["innen"]},
298 
-		{"language_id": "deu", "situation_id": "x06", "type_id": "pos", "reference_id": "rel", "words": ["in (+dat.)"]},
299 
-		{"language_id": "deu", "situation_id": "x06", "type_id": "pos", "reference_id": "att", "words": ["inner-er/e/es"]},
300 
-		{"language_id": "deu", "situation_id": "x06", "type_id": "dir", "reference_id": "abs", "words": ["(dar-/hin-/her-)ein"]},
301 
-		{"language_id": "deu", "situation_id": "x06", "type_id": "dir", "reference_id": "rel", "words": ["in (+acc.)"]},
302 
-		{"language_id": "deu", "situation_id": "x07", "type_id": "pos", "reference_id": "abs", "words": ["außen"]},
303 
-		{"language_id": "deu", "situation_id": "x07", "type_id": "pos", "reference_id": "rel", "words": ["außerhalb (+gen.)"]},
304 
-		{"language_id": "deu", "situation_id": "x07", "type_id": "pos", "reference_id": "att", "words": ["äußer-er/e/es"]},
305 
-		{"language_id": "deu", "situation_id": "x07", "type_id": "dir", "reference_id": "abs", "words": ["(dar-/hin-/her-)aus"]},
306 
-		{"language_id": "deu", "situation_id": "x07", "type_id": "dir", "reference_id": "rel", "words": ["aus (+dat.)"]},
307 
-		{"language_id": "deu", "situation_id": "x08", "type_id": "pos", "reference_id": "abs", "words": ["darauf"]},
308 
-		{"language_id": "deu", "situation_id": "x08", "type_id": "pos", "reference_id": "rel", "words": ["auf (+dat.)"]},
309 
-		{"language_id": "deu", "situation_id": "x08", "type_id": "pos", "reference_id": "att", "words": ["ober-er/e/es"]},
310 
-		{"language_id": "deu", "situation_id": "x08", "type_id": "dir", "reference_id": "abs", "words": ["(dar-/hin-/her-)auf"]},
311 
-		{"language_id": "deu", "situation_id": "x08", "type_id": "dir", "reference_id": "rel", "words": ["über (+acc.)"]},
301 
+		{"language_id": "deu", "situation_id": "x07", "type_id": "pos", "reference_id": "abs", "words": ["links"]},
302 
+		{"language_id": "deu", "situation_id": "x07", "type_id": "pos", "reference_id": "rel", "words": ["links von (+dat.)"]},
303 
+		{"language_id": "deu", "situation_id": "x07", "type_id": "pos", "reference_id": "att", "words": ["link-er/e/es"]},
304 
+		{"language_id": "deu", "situation_id": "x07", "type_id": "dir", "reference_id": "abs", "words": ["nach links"]},
305 
+		{"language_id": "deu", "situation_id": "x07", "type_id": "dir", "reference_id": "rel", "words": []},
306 
+		{"language_id": "deu", "situation_id": "x08", "type_id": "pos", "reference_id": "abs", "words": ["rechts"]},
307 
+		{"language_id": "deu", "situation_id": "x08", "type_id": "pos", "reference_id": "rel", "words": ["rechts von (+dat.)"]},
308 
+		{"language_id": "deu", "situation_id": "x08", "type_id": "pos", "reference_id": "att", "words": ["recht-er/e/es"]},
309 
+		{"language_id": "deu", "situation_id": "x08", "type_id": "dir", "reference_id": "abs", "words": ["nach rechts"]},
310 
+		{"language_id": "deu", "situation_id": "x08", "type_id": "dir", "reference_id": "rel", "words": []},
311 
+		{"language_id": "deu", "situation_id": "x04", "type_id": "pos", "reference_id": "abs", "words": ["innen"]},
312 
+		{"language_id": "deu", "situation_id": "x04", "type_id": "pos", "reference_id": "rel", "words": ["in (+dat.)"]},
313 
+		{"language_id": "deu", "situation_id": "x04", "type_id": "pos", "reference_id": "att", "words": ["inner-er/e/es"]},
314 
+		{"language_id": "deu", "situation_id": "x04", "type_id": "dir", "reference_id": "abs", "words": ["(dar-/hin-/her-)ein"]},
315 
+		{"language_id": "deu", "situation_id": "x04", "type_id": "dir", "reference_id": "rel", "words": ["in (+acc.)"]},
316 
+		{"language_id": "deu", "situation_id": "x05", "type_id": "pos", "reference_id": "abs", "words": ["außen"]},
317 
+		{"language_id": "deu", "situation_id": "x05", "type_id": "pos", "reference_id": "rel", "words": ["außerhalb (+gen.)"]},
318 
+		{"language_id": "deu", "situation_id": "x05", "type_id": "pos", "reference_id": "att", "words": ["äußer-er/e/es"]},
319 
+		{"language_id": "deu", "situation_id": "x05", "type_id": "dir", "reference_id": "abs", "words": ["(dar-/hin-/her-)aus"]},
320 
+		{"language_id": "deu", "situation_id": "x05", "type_id": "dir", "reference_id": "rel", "words": ["aus (+dat.)"]},
321 
+		{"language_id": "deu", "situation_id": "x06", "type_id": "pos", "reference_id": "abs", "words": ["darauf"]},
322 
+		{"language_id": "deu", "situation_id": "x06", "type_id": "pos", "reference_id": "rel", "words": ["auf (+dat.)"]},
323 
+		{"language_id": "deu", "situation_id": "x06", "type_id": "pos", "reference_id": "att", "words": ["ober-er/e/es"]},
324 
+		{"language_id": "deu", "situation_id": "x06", "type_id": "dir", "reference_id": "abs", "words": ["(dar-/hin-/her-)auf"]},
325 
+		{"language_id": "deu", "situation_id": "x06", "type_id": "dir", "reference_id": "rel", "words": ["über (+acc.)"]},
312 326 
 		{"language_id": "deu", "situation_id": "x09", "type_id": "pos", "reference_id": "abs", "words": ["dazwischen"]},
313 327 
 		{"language_id": "deu", "situation_id": "x09", "type_id": "pos", "reference_id": "rel", "words": ["zwischen (+dat.)"]},
314 328 
 		{"language_id": "deu", "situation_id": "x09", "type_id": "pos", "reference_id": "att", "words": ["dazwischen befindlich-er/e/es"]},
... ... 
@@ -323,7 +337,30 @@
323 337 
 		{"language_id": "deu", "situation_id": "x11", "type_id": "pos", "reference_id": "rel", "words": []},
324 338 
 		{"language_id": "deu", "situation_id": "x11", "type_id": "pos", "reference_id": "att", "words": ["dagegen seiend"]},
325 339 
 		{"language_id": "deu", "situation_id": "x11", "type_id": "dir", "reference_id": "abs", "words": ["dagegen"]},
326 
-		{"language_id": "deu", "situation_id": "x11", "type_id": "dir", "reference_id": "rel", "words": ["gegen (+acc.)"]}
340 
+		{"language_id": "deu", "situation_id": "x11", "type_id": "dir", "reference_id": "rel", "words": ["gegen (+acc.)"]},
341 
+
342 
+		{"language_id": "epo", "situation_id": "x00", "type_id": "pos", "reference_id": "rel", "words": ["antaŭ (+nom.)"]},
343 
+		{"language_id": "epo", "situation_id": "x00", "type_id": "dir", "reference_id": "rel", "words": ["antaŭ (+acc.)"]},
344 
+		{"language_id": "epo", "situation_id": "x01", "type_id": "pos", "reference_id": "rel", "words": ["malantaŭ (+nom.)"]},
345 
+		{"language_id": "epo", "situation_id": "x01", "type_id": "dir", "reference_id": "rel", "words": ["malantaŭ (+acc.)"]},
346 
+		{"language_id": "epo", "situation_id": "x03", "type_id": "pos", "reference_id": "rel", "words": ["sub (+nom.)"]},
347 
+		{"language_id": "epo", "situation_id": "x03", "type_id": "dir", "reference_id": "rel", "words": ["sub (+acc.)"]},
348 
+		{"language_id": "epo", "situation_id": "x02", "type_id": "pos", "reference_id": "rel", "words": ["super (+nom.)"]},
349 
+		{"language_id": "epo", "situation_id": "x02", "type_id": "dir", "reference_id": "rel", "words": ["super (+acc.)"]},
350 
+		{"language_id": "epo", "situation_id": "x06", "type_id": "pos", "reference_id": "rel", "words": ["sur (+nom.)"]},
351 
+		{"language_id": "epo", "situation_id": "x06", "type_id": "dir", "reference_id": "rel", "words": ["sur (+acc.)"]},
352 
+		{"language_id": "epo", "situation_id": "x04", "type_id": "pos", "reference_id": "rel", "words": ["en (+nom.)"]},
353 
+		{"language_id": "epo", "situation_id": "x04", "type_id": "dir", "reference_id": "rel", "words": ["en (+acc.)"]},
354 
+		{"language_id": "epo", "situation_id": "x05", "type_id": "pos", "reference_id": "rel", "words": ["ekster (+nom.)"]},
355 
+		{"language_id": "epo", "situation_id": "x05", "type_id": "dir", "reference_id": "rel", "words": ["el (+nom.)"]},
356 
+		{"language_id": "epo", "situation_id": "x07", "type_id": "pos", "reference_id": "rel", "words": ["maldekstra de (+nom.)"]},
357 
+		{"language_id": "epo", "situation_id": "x08", "type_id": "pos", "reference_id": "rel", "words": ["dekstra de (+nom.)"]},
358 
+		{"language_id": "epo", "situation_id": "x24", "type_id": "pos", "reference_id": "rel", "words": ["apud (+nom.)"]},
359 
+		{"language_id": "epo", "situation_id": "x24", "type_id": "dir", "reference_id": "rel", "words": ["preter (+nom.)"]},
360 
+		{"language_id": "epo", "situation_id": "x09", "type_id": "pos", "reference_id": "rel", "words": ["inter (+nom.)"]},
361 
+		{"language_id": "epo", "situation_id": "x09", "type_id": "dir", "reference_id": "rel", "words": ["inter (+acc.)"]},
362 
+		{"language_id": "epo", "situation_id": "x10", "type_id": "pos", "reference_id": "rel", "words": ["por (+nom.)"]}
363 
+
327 364 
 	]
328 365 
 }
329 366
source/logic/server/sql.php
History View file @ 93d9ca5
... ... 
@@ -58,6 +58,16 @@
58 58 
 		);
59 59 
 	}
60 60
61 
+	function sql_order($table_source, $order)
62 
+	{
63 
+		usort
64 
+		(
65 
+			$table_source,
66 
+			$order
67 
+		);
68 
+		return $table_source;
69 
+	}
70 
+
61 71 
 	function sql_condense($table_source, $columns_from, $columns_to, $condensators)
62 72 
 	{
63 73 
 		return (