Switch to unified view

a/src/mediaserver/cdplugins/plgwithslave.cxx b/src/mediaserver/cdplugins/plgwithslave.cxx
...
...
125
    }
125
    }
126
126
127
    // We may need one day to subclass PlgWithSlave to implement a
127
    // We may need one day to subclass PlgWithSlave to implement a
128
    // plugin-specific method. For now, existing plugins have
128
    // plugin-specific method. For now, existing plugins have
129
    // compatible python code, and we can keep one c++ method.
129
    // compatible python code, and we can keep one c++ method.
130
    // get_media_url() would also need changing because it accesses Internal:
130
    // get_media_url() would also need changing because it is in
131
    // either make it generic or move to subclass.
131
    // Internal: either make it generic or move to subclass.
132
    //return realplg->answer_to_connection(connection, url, method, version,
132
    //return realplg->answer_to_connection(connection, url, method, version,
133
    //                               upload_data, upload_data_size, con_cls);
133
    //                               upload_data, upload_data_size, con_cls);
134
134
135
    string path(url);
135
    string path(url);
136
136
...
...
602
    // Run query
602
    // Run query
603
    unordered_map<string, string> res;
603
    unordered_map<string, string> res;
604
    if (!m->cmd.callproc("search", {
604
    if (!m->cmd.callproc("search", {
605
        {"objid", ctid},
605
        {"objid", ctid},
606
        {"objkind", objkind},
606
        {"objkind", objkind},
607
                {"origsearch", searchstr},
607
                {"field", slavefield},
608
                {"field", slavefield},
608
        {"value", value} },  res)) {
609
        {"value", value} },  res)) {
609
    LOGERR("PlgWithSlave::search: slave failure\n");
610
    LOGERR("PlgWithSlave::search: slave failure\n");
610
    return errorEntries(ctid, entries);
611
    return errorEntries(ctid, entries);
611
    }
612
    }