@@ -308,6 +308,10 @@ |
||
| 308 | 308 | return; |
| 309 | 309 | } |
| 310 | 310 | |
| 311 | + /** |
|
| 312 | + * @param SingleRow[] $seq |
|
| 313 | + * @param string $field |
|
| 314 | + */ |
|
| 311 | 315 | protected function quickSortExec($seq, $field) |
| 312 | 316 | { |
| 313 | 317 | if (!count($seq)) return $seq; |
@@ -316,7 +316,7 @@ |
||
| 316 | 316 | $x = $y = array(); |
| 317 | 317 | |
| 318 | 318 | $cntSeq = count($seq); |
| 319 | - for ($i = 1; $i < $cntSeq; $i ++) { |
|
| 319 | + for ($i = 1; $i < $cntSeq; $i++) { |
|
| 320 | 320 | if ($seq[$i]->getField($field) <= $k->getField($field)) { |
| 321 | 321 | $x [] = $seq [$i]; |
| 322 | 322 | } else { |
@@ -310,7 +310,9 @@ |
||
| 310 | 310 | |
| 311 | 311 | protected function quickSortExec($seq, $field) |
| 312 | 312 | { |
| 313 | - if (!count($seq)) return $seq; |
|
| 313 | + if (!count($seq)) { |
|
| 314 | + return $seq; |
|
| 315 | + } |
|
| 314 | 316 | |
| 315 | 317 | $k = $seq [0]; |
| 316 | 318 | $x = $y = array(); |
@@ -20,7 +20,7 @@ |
||
| 20 | 20 | private $_rs; |
| 21 | 21 | |
| 22 | 22 | /** |
| 23 | - * @param PDOStatement $recordset |
|
| 23 | + * @param \PDOStatement $recordset |
|
| 24 | 24 | * @return void |
| 25 | 25 | */ |
| 26 | 26 | public function __construct($recordset) |
@@ -49,9 +49,7 @@ |
||
| 49 | 49 | |
| 50 | 50 | /** |
| 51 | 51 | * @access public |
| 52 | - * @param string $sql |
|
| 53 | - * @param array $array |
|
| 54 | - * @return DBIterator |
|
| 52 | + * @return FixedTextFileIterator|null |
|
| 55 | 53 | */ |
| 56 | 54 | public function getIterator() |
| 57 | 55 | { |
@@ -84,6 +84,10 @@ |
||
| 84 | 84 | } |
| 85 | 85 | } |
| 86 | 86 | |
| 87 | + /** |
|
| 88 | + * @param string $buffer |
|
| 89 | + * @param FixedTextDefinition[] $fieldDefinition |
|
| 90 | + */ |
|
| 87 | 91 | protected function processBuffer($buffer, $fieldDefinition) |
| 88 | 92 | { |
| 89 | 93 | $cntDef = count($fieldDefinition); |
@@ -47,7 +47,6 @@ discard block |
||
| 47 | 47 | * @param string $tableName |
| 48 | 48 | * @param array &$params |
| 49 | 49 | * @param string $returnFields |
| 50 | - * @param string $paramSubstName If ended with "_" the program subst by argname; |
|
| 51 | 50 | * @return string |
| 52 | 51 | */ |
| 53 | 52 | public function getSql($tableName, &$params, $returnFields = "*") |
@@ -72,8 +71,8 @@ discard block |
||
| 72 | 71 | |
| 73 | 72 | /** |
| 74 | 73 | * |
| 75 | - * @param $array |
|
| 76 | - * @return unknown_type |
|
| 74 | + * @param SingleRow[] $array |
|
| 75 | + * @return \DOMNodeList |
|
| 77 | 76 | */ |
| 78 | 77 | public function match($array) |
| 79 | 78 | { |
@@ -93,7 +92,7 @@ discard block |
||
| 93 | 92 | * |
| 94 | 93 | * @param $type use XPATH or SQL |
| 95 | 94 | * @param $param |
| 96 | - * @return unknown_type |
|
| 95 | + * @return string |
|
| 97 | 96 | */ |
| 98 | 97 | public function getFilter($type, &$param) |
| 99 | 98 | { |
@@ -242,7 +241,7 @@ discard block |
||
| 242 | 241 | /** |
| 243 | 242 | * |
| 244 | 243 | * @param string[] $array |
| 245 | - * @return string |
|
| 244 | + * @return boolean |
|
| 246 | 245 | */ |
| 247 | 246 | private function evalString($array) |
| 248 | 247 | { |
@@ -141,38 +141,38 @@ discard block |
||
| 141 | 141 | |
| 142 | 142 | $result = ""; |
| 143 | 143 | switch ($relation) { |
| 144 | - case Relation::EQUAL: { |
|
| 145 | - $result = $field . "=" . $value; |
|
| 146 | - break; |
|
| 147 | - } |
|
| 148 | - case Relation::GREATER_THAN: { |
|
| 149 | - $result = $field . ">" . $value; |
|
| 150 | - break; |
|
| 151 | - } |
|
| 152 | - case Relation::LESS_THAN: { |
|
| 153 | - $result = $field . "<" . $value; |
|
| 154 | - break; |
|
| 155 | - } |
|
| 156 | - case Relation::GREATER_OR_EQUAL_THAN: { |
|
| 157 | - $result = $field . ">=" . $value; |
|
| 158 | - break; |
|
| 159 | - } |
|
| 160 | - case Relation::LESS_OR_EQUAL_THAN: { |
|
| 161 | - $result = $field . "<=" . $value; |
|
| 162 | - break; |
|
| 163 | - } |
|
| 164 | - case Relation::NOT_EQUAL: { |
|
| 165 | - $result = $field . "!=" . $value; |
|
| 166 | - break; |
|
| 167 | - } |
|
| 168 | - case Relation::STARTS_WITH: { |
|
| 169 | - $result = " starts-with($field, $value) "; |
|
| 170 | - break; |
|
| 171 | - } |
|
| 172 | - case Relation::CONTAINS: { |
|
| 173 | - $result = " contains($field, $value) "; |
|
| 174 | - break; |
|
| 175 | - } |
|
| 144 | + case Relation::EQUAL: { |
|
| 145 | + $result = $field . "=" . $value; |
|
| 146 | + break; |
|
| 147 | + } |
|
| 148 | + case Relation::GREATER_THAN: { |
|
| 149 | + $result = $field . ">" . $value; |
|
| 150 | + break; |
|
| 151 | + } |
|
| 152 | + case Relation::LESS_THAN: { |
|
| 153 | + $result = $field . "<" . $value; |
|
| 154 | + break; |
|
| 155 | + } |
|
| 156 | + case Relation::GREATER_OR_EQUAL_THAN: { |
|
| 157 | + $result = $field . ">=" . $value; |
|
| 158 | + break; |
|
| 159 | + } |
|
| 160 | + case Relation::LESS_OR_EQUAL_THAN: { |
|
| 161 | + $result = $field . "<=" . $value; |
|
| 162 | + break; |
|
| 163 | + } |
|
| 164 | + case Relation::NOT_EQUAL: { |
|
| 165 | + $result = $field . "!=" . $value; |
|
| 166 | + break; |
|
| 167 | + } |
|
| 168 | + case Relation::STARTS_WITH: { |
|
| 169 | + $result = " starts-with($field, $value) "; |
|
| 170 | + break; |
|
| 171 | + } |
|
| 172 | + case Relation::CONTAINS: { |
|
| 173 | + $result = " contains($field, $value) "; |
|
| 174 | + break; |
|
| 175 | + } |
|
| 176 | 176 | } |
| 177 | 177 | return $result; |
| 178 | 178 | } |
@@ -200,40 +200,40 @@ discard block |
||
| 200 | 200 | $field = " $name "; |
| 201 | 201 | $valueparam = " [[" . $paramName . "]] "; |
| 202 | 202 | switch ($relation) { |
| 203 | - case Relation::EQUAL: { |
|
| 204 | - $result = $field . "=" . $valueparam; |
|
| 205 | - break; |
|
| 206 | - } |
|
| 207 | - case Relation::GREATER_THAN: { |
|
| 208 | - $result = $field . ">" . $valueparam; |
|
| 209 | - break; |
|
| 210 | - } |
|
| 211 | - case Relation::LESS_THAN: { |
|
| 212 | - $result = $field . "<" . $valueparam; |
|
| 213 | - break; |
|
| 214 | - } |
|
| 215 | - case Relation::GREATER_OR_EQUAL_THAN: { |
|
| 216 | - $result = $field . ">=" . $valueparam; |
|
| 217 | - break; |
|
| 218 | - } |
|
| 219 | - case Relation::LESS_OR_EQUAL_THAN: { |
|
| 220 | - $result = $field . "<=" . $valueparam; |
|
| 221 | - break; |
|
| 222 | - } |
|
| 223 | - case Relation::NOT_EQUAL: { |
|
| 224 | - $result = $field . "!=" . $valueparam; |
|
| 225 | - break; |
|
| 226 | - } |
|
| 227 | - case Relation::STARTS_WITH: { |
|
| 228 | - $param[$paramName] = $value . "%"; |
|
| 229 | - $result = $field . " like " . $valueparam; |
|
| 230 | - break; |
|
| 231 | - } |
|
| 232 | - case Relation::CONTAINS: { |
|
| 233 | - $param[$paramName] = "%" . $value . "%"; |
|
| 234 | - $result = $field . " like " . $valueparam; |
|
| 235 | - break; |
|
| 236 | - } |
|
| 203 | + case Relation::EQUAL: { |
|
| 204 | + $result = $field . "=" . $valueparam; |
|
| 205 | + break; |
|
| 206 | + } |
|
| 207 | + case Relation::GREATER_THAN: { |
|
| 208 | + $result = $field . ">" . $valueparam; |
|
| 209 | + break; |
|
| 210 | + } |
|
| 211 | + case Relation::LESS_THAN: { |
|
| 212 | + $result = $field . "<" . $valueparam; |
|
| 213 | + break; |
|
| 214 | + } |
|
| 215 | + case Relation::GREATER_OR_EQUAL_THAN: { |
|
| 216 | + $result = $field . ">=" . $valueparam; |
|
| 217 | + break; |
|
| 218 | + } |
|
| 219 | + case Relation::LESS_OR_EQUAL_THAN: { |
|
| 220 | + $result = $field . "<=" . $valueparam; |
|
| 221 | + break; |
|
| 222 | + } |
|
| 223 | + case Relation::NOT_EQUAL: { |
|
| 224 | + $result = $field . "!=" . $valueparam; |
|
| 225 | + break; |
|
| 226 | + } |
|
| 227 | + case Relation::STARTS_WITH: { |
|
| 228 | + $param[$paramName] = $value . "%"; |
|
| 229 | + $result = $field . " like " . $valueparam; |
|
| 230 | + break; |
|
| 231 | + } |
|
| 232 | + case Relation::CONTAINS: { |
|
| 233 | + $param[$paramName] = "%" . $value . "%"; |
|
| 234 | + $result = $field . " like " . $valueparam; |
|
| 235 | + break; |
|
| 236 | + } |
|
| 237 | 237 | } |
| 238 | 238 | |
| 239 | 239 | return $result; |
@@ -268,38 +268,38 @@ discard block |
||
| 268 | 268 | |
| 269 | 269 | foreach ($field as $valueparam) { |
| 270 | 270 | switch ($relation) { |
| 271 | - case Relation::EQUAL: { |
|
| 272 | - $result[$pos] &= ($valueparam == $value); |
|
| 273 | - break; |
|
| 274 | - } |
|
| 275 | - case Relation::GREATER_THAN: { |
|
| 276 | - $result[$pos] &= ($valueparam > $value); |
|
| 277 | - break; |
|
| 278 | - } |
|
| 279 | - case Relation::LESS_THAN: { |
|
| 280 | - $result[$pos] &= ($valueparam < $value); |
|
| 281 | - break; |
|
| 282 | - } |
|
| 283 | - case Relation::GREATER_OR_EQUAL_THAN: { |
|
| 284 | - $result[$pos] &= ($valueparam >= $value); |
|
| 285 | - break; |
|
| 286 | - } |
|
| 287 | - case Relation::LESS_OR_EQUAL_THAN: { |
|
| 288 | - $result[$pos] &= ($valueparam <= $value); |
|
| 289 | - break; |
|
| 290 | - } |
|
| 291 | - case Relation::NOT_EQUAL: { |
|
| 292 | - $result[$pos] &= ($valueparam != $value); |
|
| 293 | - break; |
|
| 294 | - } |
|
| 295 | - case Relation::STARTS_WITH: { |
|
| 296 | - $result[$pos] &= (strpos($valueparam, $value) === 0); |
|
| 297 | - break; |
|
| 298 | - } |
|
| 299 | - case Relation::CONTAINS: { |
|
| 300 | - $result[$pos] &= (strpos($valueparam, $value) !== false); |
|
| 301 | - break; |
|
| 302 | - } |
|
| 271 | + case Relation::EQUAL: { |
|
| 272 | + $result[$pos] &= ($valueparam == $value); |
|
| 273 | + break; |
|
| 274 | + } |
|
| 275 | + case Relation::GREATER_THAN: { |
|
| 276 | + $result[$pos] &= ($valueparam > $value); |
|
| 277 | + break; |
|
| 278 | + } |
|
| 279 | + case Relation::LESS_THAN: { |
|
| 280 | + $result[$pos] &= ($valueparam < $value); |
|
| 281 | + break; |
|
| 282 | + } |
|
| 283 | + case Relation::GREATER_OR_EQUAL_THAN: { |
|
| 284 | + $result[$pos] &= ($valueparam >= $value); |
|
| 285 | + break; |
|
| 286 | + } |
|
| 287 | + case Relation::LESS_OR_EQUAL_THAN: { |
|
| 288 | + $result[$pos] &= ($valueparam <= $value); |
|
| 289 | + break; |
|
| 290 | + } |
|
| 291 | + case Relation::NOT_EQUAL: { |
|
| 292 | + $result[$pos] &= ($valueparam != $value); |
|
| 293 | + break; |
|
| 294 | + } |
|
| 295 | + case Relation::STARTS_WITH: { |
|
| 296 | + $result[$pos] &= (strpos($valueparam, $value) === 0); |
|
| 297 | + break; |
|
| 298 | + } |
|
| 299 | + case Relation::CONTAINS: { |
|
| 300 | + $result[$pos] &= (strpos($valueparam, $value) !== false); |
|
| 301 | + break; |
|
| 302 | + } |
|
| 303 | 303 | } |
| 304 | 304 | } |
| 305 | 305 | } |
@@ -264,7 +264,9 @@ |
||
| 264 | 264 | |
| 265 | 265 | $field = $array->getField($name); |
| 266 | 266 | |
| 267 | - if (!is_array($field)) $field = array($field); |
|
| 267 | + if (!is_array($field)) { |
|
| 268 | + $field = array($field); |
|
| 269 | + } |
|
| 268 | 270 | |
| 269 | 271 | foreach ($field as $valueparam) { |
| 270 | 272 | switch ($relation) { |
@@ -53,9 +53,7 @@ |
||
| 53 | 53 | |
| 54 | 54 | /** |
| 55 | 55 | * @access public |
| 56 | - * @param string $sql |
|
| 57 | - * @param array $array |
|
| 58 | - * @return DBIterator |
|
| 56 | + * @return JsonIterator |
|
| 59 | 57 | */ |
| 60 | 58 | public function getIterator($path = "", $throwErr = false) |
| 61 | 59 | { |
@@ -23,27 +23,27 @@ |
||
| 23 | 23 | $lastError = json_last_error(); |
| 24 | 24 | $lastErrorDesc = ""; |
| 25 | 25 | switch ($lastError) { |
| 26 | - case JSON_ERROR_NONE: |
|
| 27 | - $lastErrorDesc = 'No errors'; |
|
| 28 | - break; |
|
| 29 | - case JSON_ERROR_DEPTH: |
|
| 30 | - $lastErrorDesc = 'Maximum stack depth exceeded'; |
|
| 31 | - break; |
|
| 32 | - case JSON_ERROR_STATE_MISMATCH: |
|
| 33 | - $lastErrorDesc = 'Underflow or the modes mismatch'; |
|
| 34 | - break; |
|
| 35 | - case JSON_ERROR_CTRL_CHAR: |
|
| 36 | - $lastErrorDesc = 'Unexpected control character found'; |
|
| 37 | - break; |
|
| 38 | - case JSON_ERROR_SYNTAX: |
|
| 39 | - $lastErrorDesc = 'Syntax error, malformed JSON'; |
|
| 40 | - break; |
|
| 41 | - case JSON_ERROR_UTF8: |
|
| 42 | - $lastErrorDesc = 'Malformed UTF-8 characters, possibly incorrectly encoded'; |
|
| 43 | - break; |
|
| 44 | - default: |
|
| 45 | - $lastErrorDesc = 'Unknown error'; |
|
| 46 | - break; |
|
| 26 | + case JSON_ERROR_NONE: |
|
| 27 | + $lastErrorDesc = 'No errors'; |
|
| 28 | + break; |
|
| 29 | + case JSON_ERROR_DEPTH: |
|
| 30 | + $lastErrorDesc = 'Maximum stack depth exceeded'; |
|
| 31 | + break; |
|
| 32 | + case JSON_ERROR_STATE_MISMATCH: |
|
| 33 | + $lastErrorDesc = 'Underflow or the modes mismatch'; |
|
| 34 | + break; |
|
| 35 | + case JSON_ERROR_CTRL_CHAR: |
|
| 36 | + $lastErrorDesc = 'Unexpected control character found'; |
|
| 37 | + break; |
|
| 38 | + case JSON_ERROR_SYNTAX: |
|
| 39 | + $lastErrorDesc = 'Syntax error, malformed JSON'; |
|
| 40 | + break; |
|
| 41 | + case JSON_ERROR_UTF8: |
|
| 42 | + $lastErrorDesc = 'Malformed UTF-8 characters, possibly incorrectly encoded'; |
|
| 43 | + break; |
|
| 44 | + default: |
|
| 45 | + $lastErrorDesc = 'Unknown error'; |
|
| 46 | + break; |
|
| 47 | 47 | } |
| 48 | 48 | |
| 49 | 49 | if ($lastError != JSON_ERROR_NONE) { |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | * @param type $rowsep |
| 30 | 30 | * @param type $colsep |
| 31 | 31 | * @param type $fieldnames |
| 32 | - * @param type $port |
|
| 32 | + * @param integer $port |
|
| 33 | 33 | */ |
| 34 | 34 | public function __construct($server, $path, $rowsep, $colsep, $fieldnames, $port = 80) |
| 35 | 35 | { |
@@ -42,9 +42,7 @@ discard block |
||
| 42 | 42 | } |
| 43 | 43 | |
| 44 | 44 | /** |
| 45 | - * @param string $sql |
|
| 46 | - * @param array $array |
|
| 47 | - * @return DBIterator |
|
| 45 | + * @return SocketIterator |
|
| 48 | 46 | */ |
| 49 | 47 | public function getIterator() |
| 50 | 48 | { |
@@ -1,12 +1,12 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * Access a delimited string content from a HTTP server and iterate it. |
|
| 4 | - * |
|
| 5 | - * The string have the format: |
|
| 6 | - * COLUMN1;COLUMN2;COLUMN3|COLUMN1;COLUMN2;COLUMN3|COLUMN1;COLUMN2;COLUMN3 |
|
| 7 | - * |
|
| 8 | - * You can customize the field and row separators. |
|
| 9 | - */ |
|
| 3 | + * Access a delimited string content from a HTTP server and iterate it. |
|
| 4 | + * |
|
| 5 | + * The string have the format: |
|
| 6 | + * COLUMN1;COLUMN2;COLUMN3|COLUMN1;COLUMN2;COLUMN3|COLUMN1;COLUMN2;COLUMN3 |
|
| 7 | + * |
|
| 8 | + * You can customize the field and row separators. |
|
| 9 | + */ |
|
| 10 | 10 | |
| 11 | 11 | namespace ByJG\AnyDataset\Repository; |
| 12 | 12 | |
@@ -14,7 +14,6 @@ discard block |
||
| 14 | 14 | |
| 15 | 15 | /** |
| 16 | 16 | * |
| 17 | - * @param string $json |
|
| 18 | 17 | */ |
| 19 | 18 | public function __construct($url, $namespaces = null) |
| 20 | 19 | { |
@@ -46,9 +45,7 @@ discard block |
||
| 46 | 45 | } |
| 47 | 46 | |
| 48 | 47 | /** |
| 49 | - * @param string $sql |
|
| 50 | - * @param array $array |
|
| 51 | - * @return DBIterator |
|
| 48 | + * @return SparQLIterator |
|
| 52 | 49 | */ |
| 53 | 50 | public function getIterator($sparql) |
| 54 | 51 | { |
@@ -61,9 +61,7 @@ |
||
| 61 | 61 | |
| 62 | 62 | /** |
| 63 | 63 | * @access public |
| 64 | - * @param string $sql |
|
| 65 | - * @param array $array |
|
| 66 | - * @return DBIterator |
|
| 64 | + * @return TextFileIterator|null |
|
| 67 | 65 | */ |
| 68 | 66 | public function getIterator() |
| 69 | 67 | { |