Skip to content

Commit

Permalink
no distinction between standard and pro releases in auto-updater
Browse files Browse the repository at this point in the history 
this did not work in 0.56 main (but should).
Therefore it will be necessery to provide a hand-made 'virtual pro' (just renaming) release 0.57

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@4326 6c8d7289-2bf4-0310-a012-ef5d649a1542
  • Loading branch information
orbiter committed Jan 12, 2008
1 parent 3cab851 commit f3f02b0
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 58 deletions.
28 changes: 15 additions & 13 deletions htroot/ConfigUpdate_p.java
View file
Expand Up @@ -127,7 +127,7 @@ public static serverObjects respond(httpHeader header, serverObjects post, serve

prop.put("candeploy_deployenabled", (downloaded.length == 0) ? "0" : ((devenvironment) ? "1" : "2")); // prevent that a developer-version is over-deployed

TreeSet downloadedreleases = new TreeSet();
TreeSet<yacyVersion> downloadedreleases = new TreeSet<yacyVersion>();
for (int j = 0; j < downloaded.length; j++) {
try {
release = new yacyVersion(downloaded[j]);
Expand All @@ -137,40 +137,42 @@ public static serverObjects respond(httpHeader header, serverObjects post, serve
new File(sb.releasePath, downloaded[j]).deleteOnExit(); // can be also a restart- or deploy-file
}
}
dflt = (downloadedreleases.size() == 0) ? null : (yacyVersion) downloadedreleases.last();
Iterator i = downloadedreleases.iterator();
dflt = (downloadedreleases.size() == 0) ? null : downloadedreleases.last();
Iterator<yacyVersion> i = downloadedreleases.iterator();
int relcount = 0;
while (i.hasNext()) {
release = (yacyVersion) i.next();
prop.put("candeploy_downloadedreleases_" + relcount + "_name", (release.fullRelease ? "pro" : "standard") + "/" + ((release.mainRelease) ? "main" : "dev") + " " + release.releaseNr + "/" + release.svn);
release = i.next();
prop.put("candeploy_downloadedreleases_" + relcount + "_name", ((release.mainRelease) ? "main" : "dev") + " " + release.releaseNr + "/" + release.svn);
prop.put("candeploy_downloadedreleases_" + relcount + "_file", release.name);
prop.put("candeploy_downloadedreleases_" + relcount + "_selected", (release == dflt) ? "1" : "0");
relcount++;
}
prop.put("candeploy_downloadedreleases", relcount);

// list remotely available releases
TreeSet[] releasess = yacyVersion.allReleases(false); // {0=promain, 1=prodev, 2=stdmain, 3=stddev}
yacyVersion.DevMain releasess = yacyVersion.allReleases(false);
relcount = 0;

// main
TreeSet releases = releasess[(yacy.pro) ? 0 : 2];
TreeSet<yacyVersion> releases = releasess.main;
releases.removeAll(downloadedreleases);
i = releases.iterator();
while (i.hasNext()) {
release = (yacyVersion) i.next();
prop.put("candeploy_availreleases_" + relcount + "_name", (release.fullRelease ? "pro" : "standard") + "/" + ((release.mainRelease) ? "main" : "dev") + " " + release.releaseNr + "/" + release.svn);
release = i.next();
prop.put("candeploy_availreleases_" + relcount + "_name", ((release.mainRelease) ? "main" : "dev") + " " + release.releaseNr + "/" + release.svn);
prop.put("candeploy_availreleases_" + relcount + "_url", release.url.toString());
prop.put("candeploy_availreleases_" + relcount + "_selected", "0");
relcount++;
}

// dev
dflt = (releasess[(yacy.pro) ? 1 : 3].size() == 0) ? null : (yacyVersion) releasess[(yacy.pro) ? 1 : 3].last();
releases = releasess[(yacy.pro) ? 1 : 3];
dflt = (releasess.dev.size() == 0) ? null : releasess.dev.last();
releases = releasess.dev;
releases.removeAll(downloadedreleases);
i = releases.iterator();
while (i.hasNext()) {
release = (yacyVersion) i.next();
prop.put("candeploy_availreleases_" + relcount + "_name", (release.fullRelease ? "pro" : "standard") + "/" + ((release.mainRelease) ? "main" : "dev") + " " + release.releaseNr + "/" + release.svn);
release = i.next();
prop.put("candeploy_availreleases_" + relcount + "_name", ((release.mainRelease) ? "main" : "dev") + " " + release.releaseNr + "/" + release.svn);
prop.put("candeploy_availreleases_" + relcount + "_url", release.url.toString());
prop.put("candeploy_availreleases_" + relcount + "_selected", (release == dflt) ? "1" : "0");
relcount++;
Expand Down
80 changes: 35 additions & 45 deletions source/de/anomic/yacy/yacyVersion.java
View file
Expand Up @@ -62,8 +62,8 @@ public final class yacyVersion implements Comparator<yacyVersion>, Comparable<ya
// information about latest release, retrieved from download pages
// this static information should be overwritten by network-specific locations
// for details see yacy.network.unit
private static HashMap /* URL:TreeSet[]*/ latestReleases = new HashMap();
public static ArrayList latestReleaseLocations /*string*/ = new ArrayList(); // will be initialized with value in yacy.network.unit
private static HashMap<yacyURL, DevMain> latestReleases = new HashMap<yacyURL, DevMain>();
public static ArrayList<yacyURL> latestReleaseLocations = new ArrayList<yacyURL>(); // will be initialized with value in yacy.network.unit

// private static release info about this release; is generated only once and can be retrieved by thisVersion()
private static yacyVersion thisVersion = null;
Expand All @@ -72,7 +72,7 @@ public final class yacyVersion implements Comparator<yacyVersion>, Comparable<ya
public float releaseNr;
public String dateStamp;
public int svn;
public boolean fullRelease, mainRelease;
public boolean mainRelease;
public yacyURL url;
public String name;

Expand All @@ -95,13 +95,10 @@ public yacyVersion(String release) {
// cut off tail
release = release.substring(0, release.length() - 7);
if (release.startsWith("yacy_pro_v")) {
fullRelease = true;
release = release.substring(10);
} else if (release.startsWith("yacy_emb_v")) {
fullRelease = false;
release = release.substring(10);
throw new RuntimeException("release file name '" + release + "' is not valid, no support for emb");
} else if (release.startsWith("yacy_v")) {
fullRelease = false;
release = release.substring(6);
} else {
throw new RuntimeException("release file name '" + release + "' is not valid, wrong prefix");
Expand All @@ -128,13 +125,17 @@ public yacyVersion(String release) {
} catch (NumberFormatException e) {
throw new RuntimeException("release file name '" + release + "' is not valid, '" + comp[2] + "' should be a integer number");
}
if ((this.releaseNr > YACY_STANDARDREL_IS_PRO) && (release.startsWith("yacy_v"))) {
// patch for new release strategy
this.fullRelease = true;
}
// finished! we parsed a relase string
}

public static final class DevMain {
public TreeSet<yacyVersion> dev, main;
public DevMain(TreeSet<yacyVersion> dev, TreeSet<yacyVersion> main) {
this.dev = dev;
this.main = main;
}
}

public int compareTo(yacyVersion obj) {
// returns 0 if this object is equal to the obj, -1 if this is smaller than obj and 1 if this is greater than obj
return compare(this, obj);
Expand All @@ -158,7 +159,7 @@ public int hashCode() {

public String toAnchor() {
// generates an anchor string that can be used to embed in an html for direct download
return "<a href=" + this.url.toNormalform(true, true) + ">YaCy " + ((this.fullRelease) ? "standard/full release" : "embedded release") + " v" + this.releaseNr + ", SVN " + this.svn + "</a>";
return "<a href=" + this.url.toNormalform(true, true) + ">YaCy " + ((this.mainRelease) ? "main release" : "dev release") + " v" + this.releaseNr + ", SVN " + this.svn + "</a>";
}

// static methods:
Expand Down Expand Up @@ -199,10 +200,9 @@ public static final yacyVersion rulebasedUpdateInfo(boolean manual) {
}

// check if we know that there is a release that is more recent than that which we are using
TreeSet[] releasess = yacyVersion.allReleases(true); // {0=promain, 1=prodev, 2=stdmain, 3=stddev}
boolean full = new File(sb.getRootPath(), "libx").exists();
yacyVersion latestmain = (releasess[(full) ? 0 : 2].size() == 0) ? null : (yacyVersion) releasess[(full) ? 0 : 2].last();
yacyVersion latestdev = (releasess[(full) ? 1 : 3].size() == 0) ? null : (yacyVersion) releasess[(full) ? 1 : 3].last();
DevMain releasess = yacyVersion.allReleases(true);
yacyVersion latestmain = (releasess.main.size() == 0) ? null : releasess.main.last();
yacyVersion latestdev = (releasess.dev.size() == 0) ? null : releasess.dev.last();
String concept = sb.getConfig("update.concept", "any");
String blacklist = sb.getConfig("update.blacklist", ".\\...[123]");

Expand Down Expand Up @@ -256,29 +256,23 @@ public static final yacyVersion rulebasedUpdateInfo(boolean manual) {
return null;
}

public static TreeSet[] allReleases(boolean force) {
public static DevMain allReleases(boolean force) {
// join the release infos
// {promainreleases, prodevreleases, stdmainreleases, stddevreleases}
Object[] a = new Object[latestReleaseLocations.size()];
DevMain[] a = new DevMain[latestReleaseLocations.size()];
for (int j = 0; j < latestReleaseLocations.size(); j++) {
a[j] = getReleases((yacyURL) latestReleaseLocations.get(j), force);
}
TreeSet[] r = new TreeSet[4];
TreeSet s;
for (int i = 0; i < 4; i++) {
s = new TreeSet();
for (int j = 0; j < a.length; j++) {
if ((a[j] != null) && (((TreeSet[]) a[j])[i] != null)) s.addAll(((TreeSet[]) a[j])[i]);
}
r[i] = s;
a[j] = getReleases(latestReleaseLocations.get(j), force);
}
return r;
TreeSet<yacyVersion> alldev = new TreeSet<yacyVersion>();
TreeSet<yacyVersion> allmain = new TreeSet<yacyVersion>();
for (int j = 0; j < a.length; j++) if ((a[j] != null) && (a[j].dev != null)) alldev.addAll(a[j].dev);
for (int j = 0; j < a.length; j++) if ((a[j] != null) && (a[j].main != null)) allmain.addAll(a[j].main);

return new DevMain(alldev, allmain);
}

private static TreeSet[] getReleases(yacyURL location, boolean force) {
private static DevMain getReleases(yacyURL location, boolean force) {
// get release info from a internet resource
// {promainreleases, prodevreleases, stdmainreleases, stddevreleases}
TreeSet[] latestRelease = (TreeSet[]) latestReleases.get(location);
DevMain latestRelease = latestReleases.get(location);
if (force ||
(latestRelease == null) /*||
((latestRelease[0].size() == 0) &&
Expand All @@ -291,7 +285,7 @@ private static TreeSet[] getReleases(yacyURL location, boolean force) {
return latestRelease;
}

private static TreeSet[] allReleaseFrom(yacyURL url) {
private static DevMain allReleaseFrom(yacyURL url) {
// retrieves the latest info about releases
// this is done by contacting a release location,
// parsing the content and filtering+parsing links
Expand All @@ -304,12 +298,10 @@ private static TreeSet[] allReleaseFrom(yacyURL url) {
}

// analyse links in scraper resource, and find link to latest release in it
Map anchors = scraper.getAnchors(); // a url (String) / name (String) relation
Iterator i = anchors.keySet().iterator();
TreeSet stddevreleases = new TreeSet();
TreeSet prodevreleases = new TreeSet();
TreeSet stdmainreleases = new TreeSet();
TreeSet promainreleases = new TreeSet();
Map<String, String> anchors = scraper.getAnchors(); // a url (String) / name (String) relation
Iterator<String> i = anchors.keySet().iterator();
TreeSet<yacyVersion> devreleases = new TreeSet<yacyVersion>();
TreeSet<yacyVersion> mainreleases = new TreeSet<yacyVersion>();
yacyVersion release;
while (i.hasNext()) {
try {
Expand All @@ -320,10 +312,8 @@ private static TreeSet[] allReleaseFrom(yacyURL url) {
try {
release = new yacyVersion(url);
//System.out.println("r " + release.toAnchor());
if ( release.fullRelease && release.mainRelease) promainreleases.add(release);
if ( release.fullRelease && !release.mainRelease) prodevreleases.add(release);
if (!release.fullRelease && release.mainRelease) stdmainreleases.add(release);
if (!release.fullRelease && !release.mainRelease) stddevreleases.add(release);
if ( release.mainRelease) mainreleases.add(release);
if (!release.mainRelease) devreleases.add(release);
} catch (RuntimeException e) {
// the release string was not well-formed.
// that might have been another link
Expand All @@ -332,7 +322,7 @@ private static TreeSet[] allReleaseFrom(yacyURL url) {
}
}
plasmaSwitchboard.getSwitchboard().setConfig("update.time.lookup", System.currentTimeMillis());
return new TreeSet[] {promainreleases, prodevreleases, stdmainreleases, stddevreleases} ;
return new DevMain(devreleases, mainreleases);
}

public static void downloadRelease(yacyVersion release) throws IOException {
Expand Down

0 comments on commit f3f02b0

Please sign in to comment.