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

(-)a/C4/ImportExportFramework.pm (-2 / +4 lines)
Lines 907-912 sub _processRows_Table Link Here
907
                my ($dataFields, $dataFieldsR) = _getDataFields($frameworkcode, $nodeR, \@fields, $format);
907
                my ($dataFields, $dataFieldsR) = _getDataFields($frameworkcode, $nodeR, \@fields, $format);
908
                if (scalar(@fields) == scalar(@$dataFieldsR)) {
908
                if (scalar(@fields) == scalar(@$dataFieldsR)) {
909
                    $ok = _processRow_DB($dbh, $table, $fields, $dataStr, $updateStr, $dataFieldsR, $dataFields, $PKArray, \@fieldsPK, $fields2Delete);
909
                    $ok = _processRow_DB($dbh, $table, $fields, $dataStr, $updateStr, $dataFieldsR, $dataFields, $PKArray, \@fieldsPK, $fields2Delete);
910
                } else {
911
                    warn "$j don't match number of fields " . scalar(@fields) . ' vs ' . scalar(@$dataFieldsR) . "($dataStr)";
910
                }
912
                }
911
            }
913
            }
912
            $j++;
914
            $j++;
Lines 1079-1085 sub _getDataFields Link Here
1079
            if ($format && $format eq 'ods') {
1081
            if ($format && $format eq 'ods') {
1080
                ($data, $repeated) = _getDataNodeODS($node2) if ($repeated <= 0);
1082
                ($data, $repeated) = _getDataNodeODS($node2) if ($repeated <= 0);
1081
                $repeated--;
1083
                $repeated--;
1082
                $ok = 1 if (defined($data));
1084
                $ok = 1;
1083
            } else {
1085
            } else {
1084
                if ($node2->nodeType == 1 && $node2->nodeName  =~ /(?:ss:)?Cell/) {
1086
                if ($node2->nodeType == 1 && $node2->nodeName  =~ /(?:ss:)?Cell/) {
1085
                    my @nodes3 = $node2->getElementsByTagNameNS('urn:schemas-microsoft-com:office:spreadsheet', 'Data');
1087
                    my @nodes3 = $node2->getElementsByTagNameNS('urn:schemas-microsoft-com:office:spreadsheet', 'Data');
Lines 1090-1095 sub _getDataFields Link Here
1090
                }
1092
                }
1091
            }
1093
            }
1092
            if ($ok) {
1094
            if ($ok) {
1095
                $data //= '';
1093
                $data = '' if ($data eq '#');
1096
                $data = '' if ($data eq '#');
1094
                $data = $frameworkcode if ($fields->[$i] eq 'frameworkcode');
1097
                $data = $frameworkcode if ($fields->[$i] eq 'frameworkcode');
1095
                $dataFields->{$fields->[$i]} = $data;
1098
                $dataFields->{$fields->[$i]} = $data;
1096
- 

Return to bug 27569