View | Details | Raw Unified | Return to bug 14923
Collapse All | Expand All

(-)a/labels/label-item-search.pl (-17 / +20 lines)
Lines 78-103 if ( $op eq "do_search" ) { Link Here
78
    $dateto   = $query->param('dateto');
78
    $dateto   = $query->param('dateto');
79
79
80
    if ($datefrom) {
80
    if ($datefrom) {
81
        $datefrom = output_pref({ dt => dt_from_string( $datefrom ), dateformat => 'iso', dateonly => 1 });
81
        if ( is_formatted_date_string( $datefrom ) ) {
82
        if ($QParser) {
82
            $datefrom = output_pref({ dt => dt_from_string( $datefrom ), dateformat => 'iso', dateonly => 1 });
83
            $ccl_query .= ' && ' if $ccl_textbox;
83
            if ($QParser) {
84
            $ccl_query .=
84
                $ccl_query .= ' && ' if $ccl_textbox;
85
                "acqdate(" . $datefrom . '-)';
85
                $ccl_query .=
86
        } else {
86
                    "acqdate(" . $datefrom . '-)';
87
            $ccl_query .= ' and ' if $ccl_textbox;
87
            } else {
88
            $ccl_query .=
88
                $ccl_query .= ' and ' if $ccl_textbox;
89
                "acqdate,st-date-normalized,ge=" . $datefrom;
89
                $ccl_query .=
90
                    "acqdate,st-date-normalized,ge=" . $datefrom;
91
            }
90
        }
92
        }
91
    }
93
    }
92
94
93
    if ($dateto) {
95
    if ($dateto) {
94
        $dateto = output_pref({ dt => dt_from_string( $dateto ), dateformat => 'iso', dateonly => 1 });
96
        if ( is_formatted_date_string( $datefrom ) ) {
95
        if ($QParser) {
97
            $dateto = output_pref({ dt => dt_from_string( $dateto ), dateformat => 'iso', dateonly => 1 });
96
            $ccl_query .= ' && ' if ( $ccl_textbox || $datefrom );
98
            if ($QParser) {
97
            $ccl_query .= "acqdate(-" . $dateto . ')';
99
                $ccl_query .= ' && ' if ( $ccl_textbox || $datefrom );
98
        } else {
100
                $ccl_query .= "acqdate(-" . $dateto . ')';
99
            $ccl_query .= ' and ' if ( $ccl_textbox || $datefrom );
101
            } else {
100
            $ccl_query .= "acqdate,st-date-normalized,le=" . $dateto;
102
                $ccl_query .= ' and ' if ( $ccl_textbox || $datefrom );
103
                $ccl_query .= "acqdate,st-date-normalized,le=" . $dateto;
104
            }
101
        }
105
        }
102
    }
106
    }
103
107
104
- 

Return to bug 14923