Skip to content

Commit a717a8a

Browse files
committed
Revert "make every row a new ID"
This reverts commit c382457.
1 parent 3433405 commit a717a8a

5 files changed

Lines changed: 10 additions & 32 deletions

File tree

.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

Cargo.lock

Lines changed: 0 additions & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,3 @@ csv = "1.3.1"
1010
log = "0.4.22"
1111
oxrdf = "0.2.3"
1212
oxrdfio = "0.1.3"
13-
uuid = { version = "1.11.0", features = ["v4", "fast-rng", "macro-diagnostics"] }

src/convert.rs

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ use convert_case::{Case, Casing};
1818
use csv::ReaderBuilder;
1919
use log::error;
2020
use oxrdf::{NamedNode, TermRef, TripleRef};
21-
use uuid::Uuid;
2221

2322
const C2R: &'static str = "https://decisym.ai/csv2rdf/model#";
2423

@@ -80,16 +79,20 @@ pub fn parse_csv(
8079

8180
for result in rdr.records() {
8281
let record = result.unwrap();
83-
let id = Uuid::new_v4().hyphenated().to_string();
84-
let subject = NamedNode::new(format!("{ns}{id}")).unwrap();
82+
let mut row_id = "".to_string();
8583
column_index = 0;
8684
for field in record.iter() {
87-
if field != "" {
85+
if column_index == 0 {
86+
row_id = field.trim().replace(" ", "");
87+
}
88+
// do not append empty cells
89+
else if field != "" {
8890
let column_id = headers.get(&column_index).unwrap();
91+
let subject = NamedNode::new(format!("{}{}", ns, row_id)).unwrap();
8992
let predicate = NamedNode::new(format!("{}{}", C2R, column_id)).unwrap();
9093
let object = TermRef::Literal(field.into());
9194
let csv_triple = TripleRef::new(subject.as_ref(), predicate.as_ref(), object);
92-
output.add_triple(csv_triple)?;
95+
output.add_triple(csv_triple)?
9396
}
9497
column_index += 1;
9598
}

tests/integration.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ fn test_graph_writer() {
1616
);
1717
assert!(res.is_ok());
1818

19-
assert_eq!(g.len(), 27)
19+
assert_eq!(g.len(), 23)
2020
}
2121

2222
#[test]
@@ -38,5 +38,5 @@ fn test_file_writer() {
3838
.collect::<Result<Vec<_>, _>>()
3939
.expect("failed to parse generated output file");
4040

41-
assert_eq!(quads.len(), 27)
41+
assert_eq!(quads.len(), 23)
4242
}

0 commit comments

Comments
 (0)