Switch to unified view

a/src/common/rclconfig.cpp b/src/common/rclconfig.cpp
...
...
528
        string fld = fieldCanon(stringtolower(*it));
528
        string fld = fieldCanon(stringtolower(*it));
529
        m_storedFields.insert(fld);
529
        m_storedFields.insert(fld);
530
    }
530
    }
531
    }
531
    }
532
532
533
    // Extended file attribute to field translations
534
    list<string>xattrs = m_fields->getNames("xattrtofields");
535
    for (list<string>::const_iterator it = xattrs.begin(); 
536
   it != xattrs.end(); it++) {
537
  string val;
538
  m_fields->get(*it, val, "xattrtofields");
539
  m_xattrtofld[*it] = val;
540
    }
541
533
    return true;
542
    return true;
534
}
543
}
535
544
536
// Return term indexing prefix for field name (ie: "filename" -> "XSFN")
545
// Return term indexing prefix for field name (ie: "filename" -> "XSFN")
537
bool RclConfig::getFieldPrefix(const string& _fld, string &pfx)
546
bool RclConfig::getFieldPrefix(const string& _fld, string &pfx)
...
...
879
    if (!(m_ok = r.m_ok))
888
    if (!(m_ok = r.m_ok))
880
    return;
889
    return;
881
    m_reason = r.m_reason;
890
    m_reason = r.m_reason;
882
    m_confdir = r.m_confdir;
891
    m_confdir = r.m_confdir;
883
    m_datadir = r.m_datadir;
892
    m_datadir = r.m_datadir;
884
    m_keydir = r.m_datadir;
893
    m_keydir = r.m_keydir;
894
    m_cdirs = r.m_cdirs;
885
    // We should use reference-counted objects instead!
895
    // We should use reference-counted objects instead!
886
    if (r.m_conf)
896
    if (r.m_conf)
887
    m_conf = new ConfStack<ConfTree>(*(r.m_conf));
897
    m_conf = new ConfStack<ConfTree>(*(r.m_conf));
888
    if (r.mimemap)
898
    if (r.mimemap)
889
    mimemap = new ConfStack<ConfTree>(*(r.mimemap));
899
    mimemap = new ConfStack<ConfTree>(*(r.mimemap));
890
    if (r.mimeconf)
900
    if (r.mimeconf)
891
    mimeconf = new ConfStack<ConfSimple>(*(r.mimeconf));
901
    mimeconf = new ConfStack<ConfSimple>(*(r.mimeconf));
892
    if (r.mimeview)
902
    if (r.mimeview)
893
    mimeview = new ConfStack<ConfSimple>(*(r.mimeview));
903
    mimeview = new ConfStack<ConfSimple>(*(r.mimeview));
904
    if (r.m_fields)
905
  m_fields = new ConfStack<ConfSimple>(*(r.m_fields));
906
    m_fldtopfx = r.m_fldtopfx;
907
    m_aliastocanon = r.m_aliastocanon;
908
    m_storedFields = r.m_storedFields;
909
    m_xattrtofld = r.m_xattrtofld;
894
    if (r.m_stopsuffixes)
910
    if (r.m_stopsuffixes)
895
    m_stopsuffixes = new SuffixStore(*((SuffixStore*)r.m_stopsuffixes));
911
    m_stopsuffixes = new SuffixStore(*((SuffixStore*)r.m_stopsuffixes));
896
    m_maxsufflen = r.m_maxsufflen;
912
    m_maxsufflen = r.m_maxsufflen;
897
    defcharset = r.defcharset;
913
    defcharset = r.defcharset;
898
    guesscharset = r.guesscharset;
914
    guesscharset = r.guesscharset;