Skip to content

make it work for both ms excel and google doc #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
slzhang-kabam wants to merge 1 commit into
base: master
Choose a base branch
from
Open

make it work for both ms excel and google doc #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 23 additions & 2 deletions lib/xlsx/xlsx.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,28 @@ function xlsx(file) {
return (s || '').replace(/&amp;/g, '&').replace(/&lt;/g, '<').replace(/&gt;/g, '>').replace(/&quot;/g, '"').replace(/&#x27;/g, '\'');
}

function findSheetPath(sheetId, wb, rel) {
var key, start, end, rid, target;

//sheetId -> r:id
key = 'sheetId="' + sheetId + '"';

start = wb.indexOf('r:id="', wb.indexOf(key)) + 6;
end = wb.indexOf('"', start);
rid = wb.substring(start, end);

//r:id -> Target
key = 'Relationship Id="' + rid + '"';
start = rel.indexOf('Target="', rel.indexOf(key)) + 8;
end = rel.indexOf('"', start);
target = rel.substring(start, end);

return 'xl/' + target;
}

if (typeof file === 'string') {
// Load
var wbxml, relxml;
zipTime = Date.now();
zip = zip.load(file, { base64: true });
result = { worksheets: [], zipTime: Date.now() - zipTime };
Expand All @@ -75,7 +95,8 @@ function xlsx(file) {
result.modified = new Date(s.substring(0, s.indexOf('</dcterms:modified>')));

// Get workbook info from "xl/workbook.xml" - Worksheet names exist in other places, but "activeTab" attribute must be gathered from this file anyway
s = zip.file('xl/workbook.xml').asText(); index = s.indexOf('activeTab="');
wbxml = s = zip.file('xl/workbook.xml').asText(); index = s.indexOf('activeTab="');
relxml = zip.file('xl/_rels/workbook.xml.rels').asText();
if (index > 0) {
s = s.substr(index + 11);
// Must eliminate first 11 characters before finding the index of " on the next line. Otherwise, it finds the " before the value.
Expand Down Expand Up @@ -113,7 +134,7 @@ function xlsx(file) {
// Get worksheet info from "xl/worksheets/sheetX.xml"
i = result.worksheets.length;
while (i--) {
s = zip.file('xl/worksheets/sheet' + (i + 1) + '.xml' ).asText().split('<row ');
s = zip.file(findSheetPath(i+1, wbxml, relxml)).asText().split('<row ');
w = result.worksheets[i];
w.table = s[0].indexOf('<tableParts ') > 0;
t = getAttr(s[0].substr(s[0].indexOf('<dimension')), 'ref');
Expand Down