Wrap subfield value in SubfieldValue type (#818)

Signed-off-by: Nico Wagner <[email protected]>
deutsche-nationalbibliothek · Sep 2, 2024 · c80f3bd · c80f3bd
1 parent 344d126
commit c80f3bd
Show file tree

Hide file tree

Showing 4 changed files with 305 additions and 58 deletions.
diff --git a/crates/pica-path/src/lib.rs b/crates/pica-path/src/lib.rs
@@ -362,7 +362,7 @@ impl<'a> PathExt for RecordRef<'a> {
             .flat_map(FieldRef::subfields)
             .filter_map(|subfield| {
                 if path.codes_flat().contains(subfield.code()) {
-                    Some(subfield.value())
+                    Some(subfield.value().as_bstr())
                 } else {
                     None
                 }

diff --git a/pica-record/src/error.rs b/pica-record/src/error.rs
@@ -5,6 +5,9 @@ use thiserror::Error;
 pub enum PicaError {
     #[error("'{0}' is not a valid subfield code.")]
     InvalidSubfieldCode(char),
+
+    #[error("'{0}' is not a valid subfield value.")]
+    InvalidSubfieldValue(String),
 }
 
 /// -----{ TODO }-----------------------------------------

diff --git a/pica-record/src/lib.rs b/pica-record/src/lib.rs
@@ -24,9 +24,17 @@
 //! select).
 
 pub use error::PicaError;
-pub use subfield::SubfieldCode;
+pub use subfield::{SubfieldCode, SubfieldValue, SubfieldValueRef};
+
+/// Parsers recognizing low-level primitives (e.g. subfield codes).
+#[rustfmt::skip]
+pub mod parser_v2 {
+    pub use super::subfield::parse_subfield_code;
+    pub use super::subfield::parse_subfield_value_ref;
+}
+
+// -----{ TODO }-----------------------------------------
 
-/// -----{ TODO }-----------------------------------------
 mod error;
 mod field;
 pub mod io;