fernando/luos
1
0
Fork 0
Code Releases Activity

BUG 0000 Replace date_create_from_format function for Php 5.2 support

Browse Source 
Replace date_create_from_format function with temporal solution for
Php 5.2 support
This commit is contained in:
Herbert Saal Gutierrez
2012-05-16 15:37:33 -04:00
parent 920d4908bf
commit fc2f25d2ba
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
workflow/engine/classes/class.AppSolr.php
View File

@@ -550,7 +550,7 @@ class AppSolr {
$tok = strtok ( $plainSearchText, " " );
while ( $tok !== false ) {
$fieldName = strstr ( $tok, ":", true );
$fieldName = substr($tok, 0, strpos($tok, ":")); //strstr ( $tok, ":", true ); php 5.3
$searchText = strstr ( $tok, ":" );
// verify if there's a field definition
@@ -654,12 +654,18 @@ class AppSolr {
$toDate = $matches [2];
if ($fromDateOriginal != '*') {
$fromDateDatetime = date_create_from_format ( 'Y-m-d', $fromDateOriginal );
$fromDate = gmdate ( "Y-m-d\T00:00:00\Z", $fromDateDatetime->getTimestamp () );
//TODO complete date creation
//list($year, $month, $day) = sscanf($fromDateOriginal, '%04d/%02d/%02d');
//$fromDateDatetime = new DateTime($fromDateOriginal);
//$fromDateDatetime = date_create_from_format ( 'Y-m-d', $fromDateOriginal );
//$fromDateDatetime->getTimestamp ()
$fromDate = gmdate ( "Y-m-d\T00:00:00\Z", strtotime($fromDateOriginal));
}
if ($toDateOriginal != '*') {
$toDateDatetime = date_create_from_format ( 'Y-m-d', $toDateOriginal );
$toDate = gmdate ( "Y-m-d\T00:00:00\Z", $toDateDatetime->getTimestamp () );
//list($year, $month, $day) = sscanf($fromDateOriginal, '%04d/%02d/%02d');
//$toDateDatetime = new DateTime($toDateOriginal);
//$toDateDatetime = date_create_from_format ( 'Y-m-d', $toDateOriginal );
$toDate = gmdate ( "Y-m-d\T00:00:00\Z", strtotime($fromDateOriginal) );
}
$searchText = ":[" . $fromDate . " TO " . $toDate . "]";
}
@@ -1088,6 +1094,8 @@ class AppSolr {
$newdate = false;
$withHour = true;
// try to convert string to date
//TODO convert to php 5.2 format
/*
$newdate = date_create_from_format ( 'Y-m-d H:i:s', $value );
if (! $newdate) {
$newdate = date_create_from_format ( 'Y-m-d', $value );
@@ -1101,16 +1109,18 @@ class AppSolr {
$newdate = date_create_from_format ( 'j/m/Y', $value );
$withHour = false;
}
*/
$newdate = strtotime($value);
if (! $newdate) {
$typeSufix = '*'; // not store field
}
else {
$typeSufix = '_tdt';
if ($withHour)
$value = gmdate ( "Y-m-d\TH:i:s\Z", $newdate->getTimestamp () );
//$value = gmdate ( "Y-m-d\TH:i:s\Z", $newdate->getTimestamp () );
$value = gmdate ( "Y-m-d\TH:i:s\Z", $newdate );
else {
$value = gmdate ( "Y-m-d\T00:00:00\Z", $newdate->getTimestamp () );
$value = gmdate ( "Y-m-d\T00:00:00\Z", $newdate );
}
}
break;