Switch to unified view

a/src/internfile/internfile.cpp b/src/internfile/internfile.cpp
...
...
226
    }
226
    }
227
    df->set_property(Dijon::Filter::OPERATING_MODE, 
227
    df->set_property(Dijon::Filter::OPERATING_MODE, 
228
             m_forPreview ? "view" : "index");
228
             m_forPreview ? "view" : "index");
229
    df->set_property(Dijon::Filter::DJF_UDI, udi);
229
    df->set_property(Dijon::Filter::DJF_UDI, udi);
230
230
231
#ifdef RCL_USE_XATTR
232
    // Get fields computed from extended attributes. We use the
231
    // Get fields computed from extended attributes. We use the
233
    // original file, not the m_fn which may be the uncompressed temp
232
    // original file, not the m_fn which may be the uncompressed temp
234
    // file
233
    // file
235
    if (!m_noxattrs)
234
    if (!m_noxattrs)
236
    reapXAttrs(m_cfg, f, m_XAttrsFields);
235
    reapXAttrs(m_cfg, f, m_XAttrsFields);
237
#endif //RCL_USE_XATTR
238
236
239
    // Gather metadata from external commands as configured.
237
    // Gather metadata from external commands as configured.
240
    reapMetaCmds(m_cfg, f, m_cmdFields);
238
    reapMetaCmds(m_cfg, f, m_cmdFields);
241
239
242
    df->set_docsize(docsize);
240
    df->set_docsize(docsize);
...
...
572
void FileInterner::collectIpathAndMT(Rcl::Doc& doc) const
570
void FileInterner::collectIpathAndMT(Rcl::Doc& doc) const
573
{
571
{
574
    LOGDEB2(("FileInterner::collectIpathAndMT\n"));
572
    LOGDEB2(("FileInterner::collectIpathAndMT\n"));
575
    bool hasipath = false;
573
    bool hasipath = false;
576
574
577
#ifdef RCL_USE_XATTR
578
    if (!m_noxattrs) {
575
    if (!m_noxattrs) {
579
    docFieldsFromXattrs(m_cfg, m_XAttrsFields, doc);
576
    docFieldsFromXattrs(m_cfg, m_XAttrsFields, doc);
580
    }
577
    }
581
#endif //RCL_USE_XATTR
582
578
583
    docFieldsFromMetaCmds(m_cfg, m_cmdFields, doc);
579
    docFieldsFromMetaCmds(m_cfg, m_cmdFields, doc);
584
580
585
    // If there is no ipath stack, the mimetype is the one from the file
581
    // If there is no ipath stack, the mimetype is the one from the file
586
    doc.mimetype = m_mimetype;
582
    doc.mimetype = m_mimetype;