Fixing bug with string data that doesn't use sharedStrings.xml

xlprotips · Jul 24, 2021 · 2d1feca · 2d1feca
1 parent d45a185
commit 2d1feca
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "xl"
-version = "0.1.3"
+version = "0.1.4"
 edition = "2018"
 license = "MIT"
 description = "A package to let you process *big* Excel files very quickly"

diff --git a/src/lib.rs b/src/lib.rs
@@ -149,7 +149,7 @@ pub fn run(config: Config) -> Result<(), String> {
 pub fn usage() {
     println!(concat!(
         "\n",
-        "xlcat 0.1.3\n",
+        "xlcat 0.1.4\n",
         "Kevin Ryan <[email protected]>\n",
         "\n",
         "xlcat is like cat, but for Excel files (xlsx files to be precise). You simply\n",

diff --git a/src/ws.rs b/src/ws.rs
@@ -337,14 +337,17 @@ impl<'a> Iterator for RowIter<'a> {
                     Ok(Event::Text(ref e)) if in_value => {
                         c.raw_value = e.unescape_and_decode(&reader).unwrap();
                         c.value = match &c.cell_type[..] {
-                            "s" | "str" => {
+                            "s" => {
                                 if let Ok(pos) = c.raw_value.parse::<usize>() {
                                     let s = &strings[pos]; // .to_string()
                                     ExcelValue::String(Cow::Borrowed(s))
                                 } else {
                                     ExcelValue::String(Cow::Owned(c.raw_value.clone()))
                                 }
                             },
+                            "str" => {
+                                ExcelValue::String(Cow::Owned(c.raw_value.clone()))
+                            },
                             "b" => {
                                 if c.raw_value == "0" {
                                     ExcelValue::Bool(false)